Browse Source

首页更改

yee 8 years ago
parent
commit
dd08716671
46 changed files with 6495 additions and 12037 deletions
  1. 167 299
      build/admin/index.css
  2. 4 9
      build/admin/index.js
  3. 147 442
      build/admin/login.css
  4. 4 9
      build/admin/login.js
  5. 825 1299
      build/admin/servicesManage/copyright.css
  6. 4 9
      build/admin/servicesManage/copyright.js
  7. 825 1299
      build/admin/servicesManage/highTech.css
  8. 4 9
      build/admin/servicesManage/highTech.js
  9. 528 1213
      build/admin/servicesManage/patent.css
  10. 4 9
      build/admin/servicesManage/patent.js
  11. 589 1070
      build/admin/userManage.css
  12. 4 9
      build/admin/userManage.js
  13. BIN
      build/image/bg.jpg
  14. 250 605
      build/user/account/index.css
  15. 4 9
      build/user/account/index.js
  16. 725 1161
      build/user/account/services.css
  17. 4 9
      build/user/account/services.js
  18. 810 1282
      build/user/account/set.css
  19. 4 9
      build/user/account/set.js
  20. 270 759
      build/user/certify.css
  21. 4 9
      build/user/certify.js
  22. 270 759
      build/user/groupCertify.css
  23. 4 9
      build/user/groupCertify.js
  24. BIN
      build/user/image/bg.jpg
  25. 2 7
      build/user/index.js
  26. 435 805
      build/user/login.css
  27. 4 9
      build/user/login.js
  28. 437 801
      build/user/signIn.css
  29. 4 9
      build/user/signIn.js
  30. 2 2
      build/vendors.js
  31. BIN
      image/218894389504034269.jpg
  32. BIN
      image/bg.jpg
  33. 4 3
      js/component/account/services/intellectualDesc.jsx
  34. 1 1
      js/component/login/adminLogin.jsx
  35. 25 7
      js/component/login/login.less
  36. 1 1
      js/component/login/loginForm.jsx
  37. 1 1
      js/component/login/loginTop.jsx
  38. 7 3
      js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx
  39. 64 55
      js/component/manageCenter/servicesManage/highTech/fosterDesc/content.jsx
  40. 29 22
      js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx
  41. 3 2
      js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectual.jsx
  42. 7 5
      js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectualDesc.jsx
  43. 5 3
      js/component/manageCenter/servicesManage/highTech/fosterDesc/standard.jsx
  44. 1 1
      js/component/manageCenter/servicesManage/highTech/highTechFoster.jsx
  45. 1 1
      package.json
  46. 12 12
      webpack.config.js

+ 167 - 299
build/admin/index.css

@@ -115,7 +115,6 @@ hr {
 pre {
   font-family: monospace, monospace;
   /* 1 */
-  /* stylelint-disable-line font-family-no-duplicate-names */
   font-size: 1em;
   /* 2 */
 }
@@ -174,7 +173,6 @@ kbd,
 samp {
   font-family: monospace, monospace;
   /* 1 */
-  /* stylelint-disable-line font-family-no-duplicate-names */
   font-size: 1em;
   /* 2 */
 }
@@ -452,10 +450,10 @@ body {
   height: 100%;
 }
 body {
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", SimSun, sans-serif;
   font-size: 12px;
   line-height: 1.5;
-  color: rgba(0, 0, 0, 0.65);
+  color: #666;
   background-color: #fff;
 }
 body,
@@ -529,10 +527,10 @@ a {
   transition: color .3s ease;
 }
 a:hover {
-  color: #80b9ff;
+  color: #79b5ff;
 }
 a:active {
-  color: #4386e7;
+  color: #549bf2;
 }
 a:active,
 a:hover {
@@ -540,7 +538,7 @@ a:hover {
   text-decoration: none;
 }
 a[disabled] {
-  color: rgba(0, 0, 0, 0.25);
+  color: #ccc;
   cursor: not-allowed;
   pointer-events: none;
 }
@@ -575,7 +573,8 @@ samp {
   font-family: 'anticon';
   src: url('https://at.alicdn.com/t/font_r5u29ls31bgldi.eot');
   /* IE9*/
-  src: url('https://at.alicdn.com/t/font_r5u29ls31bgldi.eot?#iefix') format('embedded-opentype'), /* chrome、firefox */ url('https://at.alicdn.com/t/font_r5u29ls31bgldi.woff') format('woff'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('https://at.alicdn.com/t/font_r5u29ls31bgldi.ttf') format('truetype'), /* iOS 4.1- */ url('https://at.alicdn.com/t/font_r5u29ls31bgldi.svg#iconfont') format('svg');
+  src: url('https://at.alicdn.com/t/font_r5u29ls31bgldi.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('https://at.alicdn.com/t/font_r5u29ls31bgldi.woff') format('woff'), /* chrome、firefox */ url('https://at.alicdn.com/t/font_r5u29ls31bgldi.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('https://at.alicdn.com/t/font_r5u29ls31bgldi.svg#iconfont') format('svg');
+  /* iOS 4.1- */
 }
 .anticon {
   display: inline-block;
@@ -583,6 +582,7 @@ samp {
   vertical-align: baseline;
   text-align: center;
   text-transform: none;
+  text-rendering: auto;
   line-height: 1;
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
@@ -1264,12 +1264,10 @@ samp {
 .anticon-select:before {
   content: "\E64A";
 }
-.anticon-addfile:before,
-.anticon-file-add:before {
+.anticon-addfile:before {
   content: "\E910";
 }
-.anticon-addfolder:before,
-.anticon-folder-add:before {
+.anticon-addfolder:before {
   content: "\E914";
 }
 .anticon-switcher:before {
@@ -1772,7 +1770,7 @@ samp {
 @keyframes antSwingIn {
   0%,
   100% {
-    transform: translateX(0);
+    transform: translateX(0px);
   }
   20% {
     transform: translateX(-10px);
@@ -2112,150 +2110,14 @@ samp {
   overflow: hidden;
 }
 .ant-motion-collapse-active {
-  transition: height .2s, opacity .2s;
-}
-.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-nav-container {
-  height: 32px;
-}
-.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-ink-bar {
-  visibility: hidden;
-}
-.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab {
-  margin: 0;
-  border: 1px solid #d9d9d9;
-  border-bottom: 0;
-  border-radius: 4px 4px 0 0;
-  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-  background: #f9f9f9;
-  margin-right: 2px;
-}
-.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab {
-  padding: 5px 16px 4px;
-  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-}
-.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab-active {
-  background: #fff;
-  transform: translateZ(0);
-  border-color: #d9d9d9;
-  color: #58a3ff;
-}
-.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab-active {
-  padding-bottom: 5px;
-  transform: translateZ(0);
-}
-.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-nav-wrap {
-  margin-bottom: 0;
-}
-.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab .anticon-close {
-  margin-right: 0;
-  color: rgba(0, 0, 0, 0.43);
-  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-  display: inline-block;
-  font-size: 12px;
-  font-size: 9px \9;
-  transform: scale(0.75) rotate(0deg);
-  /* IE6-IE8 */
-  -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=1, M12=0, M21=0, M22=1)";
-  zoom: 1;
-  transform-origin: 100% 50%;
-  width: 0;
-  text-align: right;
-  vertical-align: middle;
-  overflow: hidden;
-}
-:root .ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab .anticon-close {
-  filter: none;
-}
-:root .ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab .anticon-close {
-  font-size: 12px;
-}
-.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab .anticon-close:hover {
-  color: #404040;
-  font-weight: bold;
-}
-.ant-tabs.ant-tabs-editable-card > .ant-tabs-bar .ant-tabs-tab:not(.ant-tabs-tab-active):hover {
-  padding-left: 8px;
-  padding-right: 8px;
-}
-.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab-active .anticon-close,
-.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab:hover .anticon-close {
-  width: 16px;
-  transform: translateZ(0);
-}
-.ant-tabs-extra-content {
-  float: right;
-  line-height: 32px;
-}
-.ant-tabs-extra-content .ant-tabs-new-tab {
-  width: 20px;
-  height: 20px;
-  line-height: 20px;
-  text-align: center;
-  cursor: pointer;
-  border-radius: 4px;
-  border: 1px solid #d9d9d9;
-  display: inline-block;
-  font-size: 12px;
-  font-size: 10px \9;
-  transform: scale(0.83333333) rotate(0deg);
-  /* IE6-IE8 */
-  -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=1, M12=0, M21=0, M22=1)";
-  zoom: 1;
-  color: rgba(0, 0, 0, 0.43);
-  transition: color 0.3s ease;
-}
-:root .ant-tabs-extra-content .ant-tabs-new-tab {
-  filter: none;
-}
-:root .ant-tabs-extra-content .ant-tabs-new-tab {
-  font-size: 12px;
-}
-.ant-tabs-extra-content .ant-tabs-new-tab:hover {
-  color: #404040;
-}
-.ant-tabs-vertical.ant-tabs-card > .ant-tabs-bar .ant-tabs-nav-container {
-  height: auto;
-}
-.ant-tabs-vertical.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab {
-  border-bottom: 1px solid #d9d9d9;
-  margin-bottom: 8px;
-}
-.ant-tabs-vertical.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab-active {
-  padding-bottom: 4px;
-}
-.ant-tabs-vertical.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab:last-child {
-  margin-bottom: 8px;
-}
-.ant-tabs-vertical.ant-tabs-card.ant-tabs-left > .ant-tabs-bar .ant-tabs-nav-wrap {
-  margin-right: 0;
-}
-.ant-tabs-vertical.ant-tabs-card.ant-tabs-left > .ant-tabs-bar .ant-tabs-tab {
-  border-right: 0;
-  border-radius: 4px 0 0 4px;
-  margin-right: 1px;
-}
-.ant-tabs-vertical.ant-tabs-card.ant-tabs-left > .ant-tabs-bar .ant-tabs-tab-active {
-  margin-right: -1px;
-  padding-right: 18px;
-}
-.ant-tabs-vertical.ant-tabs-card.ant-tabs-right > .ant-tabs-bar .ant-tabs-nav-wrap {
-  margin-left: 0;
-}
-.ant-tabs-vertical.ant-tabs-card.ant-tabs-right > .ant-tabs-bar .ant-tabs-tab {
-  border-left: 0;
-  border-radius: 0 4px 4px 0;
-  margin-left: 1px;
-}
-.ant-tabs-vertical.ant-tabs-card.ant-tabs-right > .ant-tabs-bar .ant-tabs-tab-active {
-  margin-left: -1px;
-  padding-left: 18px;
+  transition: height 0.2s cubic-bezier(0.215, 0.61, 0.355, 1);
 }
 .ant-tabs {
   box-sizing: border-box;
   position: relative;
   overflow: hidden;
   zoom: 1;
-  color: rgba(0, 0, 0, 0.65);
+  color: #666;
 }
 .ant-tabs:before,
 .ant-tabs:after {
@@ -2325,12 +2187,12 @@ samp {
   background-color: transparent;
   position: absolute;
   text-align: center;
-  color: rgba(0, 0, 0, 0.43);
+  color: #999;
   transition: color 0.3s ease;
 }
 .ant-tabs-tab-prev:hover,
 .ant-tabs-tab-next:hover {
-  color: rgba(0, 0, 0, 0.65);
+  color: #666;
 }
 .ant-tabs-tab-prev-icon,
 .ant-tabs-tab-next-icon {
@@ -2369,7 +2231,7 @@ samp {
 }
 .ant-tabs-tab-btn-disabled,
 .ant-tabs-tab-btn-disabled:hover {
-  color: rgba(0, 0, 0, 0.25);
+  color: #ccc;
 }
 .ant-tabs-tab-next {
   right: 2px;
@@ -2414,7 +2276,7 @@ samp {
 .ant-tabs-nav .ant-tabs-tab-disabled {
   pointer-events: none;
   cursor: default;
-  color: rgba(0, 0, 0, 0.25);
+  color: #ccc;
 }
 .ant-tabs-nav .ant-tabs-tab {
   display: inline-block;
@@ -2428,10 +2290,10 @@ samp {
   text-decoration: none;
 }
 .ant-tabs-nav .ant-tabs-tab:hover {
-  color: #80b9ff;
+  color: #79b5ff;
 }
 .ant-tabs-nav .ant-tabs-tab:active {
-  color: #4386e7;
+  color: #549bf2;
 }
 .ant-tabs-nav .ant-tabs-tab .anticon {
   width: 14px;
@@ -2448,25 +2310,25 @@ samp {
   margin-right: 0;
   padding: 8px 16px;
 }
-.ant-tabs:not(.ant-tabs-vertical) > .ant-tabs-content {
+.ant-tabs:not(.ant-tabs-vertical) .ant-tabs-content {
   width: 100%;
 }
-.ant-tabs:not(.ant-tabs-vertical) > .ant-tabs-content > .ant-tabs-tabpane {
+.ant-tabs:not(.ant-tabs-vertical) .ant-tabs-content-animated {
+  display: flex;
+  flex-direction: row;
+  will-change: margin-left;
+  transition: margin-left 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+}
+.ant-tabs:not(.ant-tabs-vertical) .ant-tabs-tabpane {
   flex-shrink: 0;
   width: 100%;
   transition: opacity 0.3s;
   opacity: 1;
 }
-.ant-tabs:not(.ant-tabs-vertical) > .ant-tabs-content > .ant-tabs-tabpane-inactive {
+.ant-tabs:not(.ant-tabs-vertical) .ant-tabs-tabpane-inactive {
   opacity: 0;
   height: 0;
 }
-.ant-tabs:not(.ant-tabs-vertical) > .ant-tabs-content-animated {
-  display: flex;
-  flex-direction: row;
-  will-change: margin-left;
-  transition: margin-left 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-}
 .ant-tabs-vertical > .ant-tabs-bar {
   border-bottom: 0;
 }
@@ -2545,15 +2407,113 @@ samp {
   margin-bottom: 0;
   margin-top: 16px;
 }
-.no-flex > .ant-tabs-content-animated,
-.ant-tabs-no-animation > .ant-tabs-content-animated,
-.ant-tabs-vertical > .ant-tabs-content-animated {
-  transform: none !important;
-  margin-left: 0 !important;
+.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-nav-container {
+  height: 32px;
+}
+.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-ink-bar {
+  visibility: hidden;
+}
+.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab {
+  margin: 0;
+  border: 1px solid #d9d9d9;
+  border-bottom: 0;
+  border-radius: 6px 6px 0 0;
+  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  background: #f9f9f9;
+  margin-right: 2px;
+}
+.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab {
+  padding: 5px 16px 4px;
+  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
 }
-.no-flex > .ant-tabs-content > .ant-tabs-tabpane-inactive,
-.ant-tabs-no-animation > .ant-tabs-content > .ant-tabs-tabpane-inactive,
-.ant-tabs-vertical > .ant-tabs-content > .ant-tabs-tabpane-inactive {
+.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab-active {
+  background: #fff;
+  transform: translateZ(0);
+  border-color: #d9d9d9;
+  color: #58a3ff;
+}
+.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab-active {
+  padding-bottom: 5px;
+  transform: translateZ(0);
+}
+.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-nav-wrap {
+  margin-bottom: 0;
+}
+.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab .anticon-close {
+  margin-right: 0;
+  color: #999;
+  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  display: inline-block;
+  font-size: 12px;
+  font-size: 9px \9;
+  transform: scale(0.75) rotate(0deg);
+  /* IE6-IE8 */
+  -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=1, M12=0, M21=0, M22=1)";
+  zoom: 1;
+  transform-origin: 100% 50%;
+  width: 0;
+  text-align: right;
+  vertical-align: middle;
+  overflow: hidden;
+}
+:root .ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab .anticon-close {
+  filter: none;
+}
+:root .ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab .anticon-close {
+  font-size: 12px;
+}
+.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab .anticon-close:hover {
+  color: #404040;
+  font-weight: bold;
+}
+.ant-tabs.ant-tabs-editable-card > .ant-tabs-bar .ant-tabs-tab:not(.ant-tabs-tab-active):hover {
+  padding-left: 8px;
+  padding-right: 8px;
+}
+.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab-active .anticon-close,
+.ant-tabs.ant-tabs-card > .ant-tabs-bar .ant-tabs-tab:hover .anticon-close {
+  width: 16px;
+  transform: translateZ(0);
+}
+.ant-tabs-extra-content {
+  float: right;
+  line-height: 32px;
+}
+.ant-tabs-extra-content .ant-tabs-new-tab {
+  width: 20px;
+  height: 20px;
+  line-height: 20px;
+  text-align: center;
+  cursor: pointer;
+  border-radius: 3px;
+  border: 1px solid #d9d9d9;
+  display: inline-block;
+  font-size: 12px;
+  font-size: 10px \9;
+  transform: scale(0.83333333) rotate(0deg);
+  /* IE6-IE8 */
+  -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=1, M12=0, M21=0, M22=1)";
+  zoom: 1;
+  color: #999;
+  transition: color 0.3s ease;
+}
+:root .ant-tabs-extra-content .ant-tabs-new-tab {
+  filter: none;
+}
+:root .ant-tabs-extra-content .ant-tabs-new-tab {
+  font-size: 12px;
+}
+.ant-tabs-extra-content .ant-tabs-new-tab:hover {
+  color: #404040;
+}
+.no-flex .ant-tabs-content-animated,
+.ant-tabs-no-animation .ant-tabs-content-animated,
+.ant-tabs-vertical .ant-tabs-content-animated {
+  transform: none!important;
+}
+.no-flex .ant-tabs-content > .ant-tabs-tabpane-inactive,
+.ant-tabs-no-animation .ant-tabs-content > .ant-tabs-tabpane-inactive,
+.ant-tabs-vertical .ant-tabs-content > .ant-tabs-tabpane-inactive {
   display: none;
 }
 .ant-row {
@@ -3015,18 +2975,6 @@ samp {
 .ant-col-pull-0 {
   right: auto;
 }
-.ant-col-push-0 {
-  left: auto;
-}
-.ant-col-pull-0 {
-  right: auto;
-}
-.ant-col-offset-0 {
-  margin-left: 0;
-}
-.ant-col-order-0 {
-  order: 0;
-}
 .ant-col-xs-1, .ant-col-xs-2, .ant-col-xs-3, .ant-col-xs-4, .ant-col-xs-5, .ant-col-xs-6, .ant-col-xs-7, .ant-col-xs-8, .ant-col-xs-9, .ant-col-xs-10, .ant-col-xs-11, .ant-col-xs-12, .ant-col-xs-13, .ant-col-xs-14, .ant-col-xs-15, .ant-col-xs-16, .ant-col-xs-17, .ant-col-xs-18, .ant-col-xs-19, .ant-col-xs-20, .ant-col-xs-21, .ant-col-xs-22, .ant-col-xs-23, .ant-col-xs-24 {
   float: left;
   flex: 0 0 auto;
@@ -3424,18 +3372,6 @@ samp {
 .ant-col-pull-0 {
   right: auto;
 }
-.ant-col-xs-push-0 {
-  left: auto;
-}
-.ant-col-xs-pull-0 {
-  right: auto;
-}
-.ant-col-xs-offset-0 {
-  margin-left: 0;
-}
-.ant-col-xs-order-0 {
-  order: 0;
-}
 @media (min-width: 768px) {
   .ant-col-sm-1, .ant-col-sm-2, .ant-col-sm-3, .ant-col-sm-4, .ant-col-sm-5, .ant-col-sm-6, .ant-col-sm-7, .ant-col-sm-8, .ant-col-sm-9, .ant-col-sm-10, .ant-col-sm-11, .ant-col-sm-12, .ant-col-sm-13, .ant-col-sm-14, .ant-col-sm-15, .ant-col-sm-16, .ant-col-sm-17, .ant-col-sm-18, .ant-col-sm-19, .ant-col-sm-20, .ant-col-sm-21, .ant-col-sm-22, .ant-col-sm-23, .ant-col-sm-24 {
     float: left;
@@ -3834,18 +3770,6 @@ samp {
   .ant-col-pull-0 {
     right: auto;
   }
-  .ant-col-sm-push-0 {
-    left: auto;
-  }
-  .ant-col-sm-pull-0 {
-    right: auto;
-  }
-  .ant-col-sm-offset-0 {
-    margin-left: 0;
-  }
-  .ant-col-sm-order-0 {
-    order: 0;
-  }
 }
 @media (min-width: 992px) {
   .ant-col-md-1, .ant-col-md-2, .ant-col-md-3, .ant-col-md-4, .ant-col-md-5, .ant-col-md-6, .ant-col-md-7, .ant-col-md-8, .ant-col-md-9, .ant-col-md-10, .ant-col-md-11, .ant-col-md-12, .ant-col-md-13, .ant-col-md-14, .ant-col-md-15, .ant-col-md-16, .ant-col-md-17, .ant-col-md-18, .ant-col-md-19, .ant-col-md-20, .ant-col-md-21, .ant-col-md-22, .ant-col-md-23, .ant-col-md-24 {
@@ -4245,18 +4169,6 @@ samp {
   .ant-col-pull-0 {
     right: auto;
   }
-  .ant-col-md-push-0 {
-    left: auto;
-  }
-  .ant-col-md-pull-0 {
-    right: auto;
-  }
-  .ant-col-md-offset-0 {
-    margin-left: 0;
-  }
-  .ant-col-md-order-0 {
-    order: 0;
-  }
 }
 @media (min-width: 1200px) {
   .ant-col-lg-1, .ant-col-lg-2, .ant-col-lg-3, .ant-col-lg-4, .ant-col-lg-5, .ant-col-lg-6, .ant-col-lg-7, .ant-col-lg-8, .ant-col-lg-9, .ant-col-lg-10, .ant-col-lg-11, .ant-col-lg-12, .ant-col-lg-13, .ant-col-lg-14, .ant-col-lg-15, .ant-col-lg-16, .ant-col-lg-17, .ant-col-lg-18, .ant-col-lg-19, .ant-col-lg-20, .ant-col-lg-21, .ant-col-lg-22, .ant-col-lg-23, .ant-col-lg-24 {
@@ -4656,18 +4568,6 @@ samp {
   .ant-col-pull-0 {
     right: auto;
   }
-  .ant-col-lg-push-0 {
-    left: auto;
-  }
-  .ant-col-lg-pull-0 {
-    right: auto;
-  }
-  .ant-col-lg-offset-0 {
-    margin-left: 0;
-  }
-  .ant-col-lg-order-0 {
-    order: 0;
-  }
 }
 .ant-menu {
   outline: none;
@@ -4676,7 +4576,7 @@ samp {
   list-style: none;
   z-index: 1050;
   box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
-  color: rgba(0, 0, 0, 0.65);
+  color: #666;
   background: #fff;
   line-height: 46px;
 }
@@ -4688,7 +4588,7 @@ samp {
   padding: 0;
 }
 .ant-menu-item-group-title {
-  color: rgba(0, 0, 0, 0.43);
+  color: #999;
   font-size: 12px;
   line-height: 1.5;
   padding: 8px 16px;
@@ -4699,16 +4599,12 @@ samp {
   cursor: pointer;
   transition: all 0.3s ease;
 }
-.ant-menu-item:active,
-.ant-menu-submenu-title:active {
-  background: #f2f8ff;
-}
 .ant-menu-submenu .ant-menu-sub {
   cursor: initial;
 }
 .ant-menu-item > a {
   display: block;
-  color: rgba(0, 0, 0, 0.65);
+  color: #666;
 }
 .ant-menu-item > a:hover {
   color: #58a3ff;
@@ -4732,14 +4628,10 @@ samp {
 }
 .ant-menu-item:hover,
 .ant-menu-item-active,
-.ant-menu:not(.ant-menu-inline) .ant-menu-submenu-open,
 .ant-menu-submenu-active,
 .ant-menu-submenu-title:hover {
   color: #58a3ff;
 }
-.ant-menu:not(.ant-menu-inline) .ant-menu-submenu-open {
-  z-index: 1050;
-}
 .ant-menu-horizontal .ant-menu-item,
 .ant-menu-horizontal .ant-menu-submenu {
   margin-top: -1px;
@@ -4758,7 +4650,7 @@ samp {
   color: #58a3ff;
 }
 .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {
-  background-color: #f2f8ff;
+  background-color: #eef6ff;
 }
 .ant-menu-horizontal,
 .ant-menu-inline,
@@ -4771,30 +4663,21 @@ samp {
 }
 .ant-menu-inline .ant-menu-item,
 .ant-menu-vertical .ant-menu-item {
-  border-right: 3px solid transparent;
+  border-right: 1px solid #e9e9e9;
   margin-left: -1px;
   left: 1px;
   position: relative;
   z-index: 1;
 }
-.ant-menu-vertical.ant-menu-sub {
+.ant-menu-vertical .ant-menu-sub {
   border-right: 0;
 }
-.ant-menu-vertical.ant-menu-sub .ant-menu-item {
+.ant-menu-vertical .ant-menu-sub .ant-menu-item {
   border-right: 0;
-  margin-left: 0;
-  left: 0;
-}
-.ant-menu-vertical.ant-menu-sub > .ant-menu-item:first-child {
-  border-radius: 4px 4px 0 0;
-}
-.ant-menu-vertical.ant-menu-sub > .ant-menu-item:last-child,
-.ant-menu-vertical.ant-menu-sub > .ant-menu-item-group:last-child > .ant-menu-item-group-list:last-child > .ant-menu-item:last-child {
-  border-radius: 0 0 4px 4px;
 }
 .ant-menu-inline .ant-menu-selected,
 .ant-menu-inline .ant-menu-item-selected {
-  border-right-color: #58a3ff;
+  border-right: 3px solid #58a3ff;
   transform: translateZ(0);
 }
 .ant-menu-submenu-horizontal > .ant-menu {
@@ -4824,11 +4707,25 @@ samp {
   display: block;
   white-space: nowrap;
 }
+.ant-menu-item.ant-menu-item-disabled,
+.ant-menu-submenu-title.ant-menu-item-disabled,
+.ant-menu-item.ant-menu-submenu-disabled,
+.ant-menu-submenu-title.ant-menu-submenu-disabled {
+  color: #999 !important;
+  cursor: not-allowed;
+  background: none;
+}
+.ant-menu-item.ant-menu-item-disabled > a,
+.ant-menu-submenu-title.ant-menu-item-disabled > a,
+.ant-menu-item.ant-menu-submenu-disabled > a,
+.ant-menu-submenu-title.ant-menu-submenu-disabled > a {
+  color: #999 !important;
+  pointer-events: none;
+}
 .ant-menu-item .anticon,
 .ant-menu-submenu-title .anticon {
   min-width: 14px;
   margin-right: 8px;
-  transition: all .3s;
 }
 .ant-menu > .ant-menu-item-divider {
   height: 1px;
@@ -4912,8 +4809,6 @@ samp {
 .ant-menu-horizontal > .ant-menu-submenu:hover,
 .ant-menu-horizontal > .ant-menu-item-active,
 .ant-menu-horizontal > .ant-menu-submenu-active,
-.ant-menu-horizontal > .ant-menu-item-open,
-.ant-menu-horizontal > .ant-menu-submenu-open,
 .ant-menu-horizontal > .ant-menu-item-selected,
 .ant-menu-horizontal > .ant-menu-submenu-selected {
   border-bottom: 2px solid #58a3ff;
@@ -4922,7 +4817,7 @@ samp {
 .ant-menu-horizontal > .ant-menu-item > a,
 .ant-menu-horizontal > .ant-menu-submenu > a {
   display: block;
-  color: rgba(0, 0, 0, 0.65);
+  color: #666;
 }
 .ant-menu-horizontal > .ant-menu-item > a:hover,
 .ant-menu-horizontal > .ant-menu-submenu > a:hover {
@@ -4934,21 +4829,19 @@ samp {
   height: 0;
   clear: both;
 }
-.ant-menu-vertical .ant-menu-item,
-.ant-menu-inline .ant-menu-item,
-.ant-menu-vertical .ant-menu-submenu-title,
-.ant-menu-inline .ant-menu-submenu-title {
-  padding: 0 16px;
+.ant-menu-vertical > .ant-menu-item,
+.ant-menu-inline > .ant-menu-item,
+.ant-menu-item-group-list > .ant-menu-item,
+.ant-menu-vertical > .ant-menu-submenu > .ant-menu-submenu-title,
+.ant-menu-inline > .ant-menu-submenu > .ant-menu-submenu-title,
+.ant-menu-item-group-list > .ant-menu-submenu > .ant-menu-submenu-title {
+  padding: 0px 16px 0 28px;
   font-size: 12px;
   line-height: 42px;
   height: 42px;
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.ant-menu-item-group-list .ant-menu-item,
-.ant-menu-item-group-list .ant-menu-submenu-title {
-  padding: 0 16px 0 28px;
-}
 .ant-menu-vertical.ant-menu-sub {
   padding: 0;
   transform-origin: 0 0;
@@ -4977,21 +4870,9 @@ samp {
 .ant-menu-sub.ant-menu-inline .ant-menu-item-group-title {
   padding-left: 32px;
 }
-.ant-menu-item-disabled,
-.ant-menu-submenu-disabled {
-  color: rgba(0, 0, 0, 0.25) !important;
-  cursor: not-allowed;
-  background: none;
-  border-color: transparent !important;
-}
-.ant-menu-item-disabled > a,
-.ant-menu-submenu-disabled > a {
-  color: rgba(0, 0, 0, 0.25) !important;
-  pointer-events: none;
-}
 .ant-menu-dark,
 .ant-menu-dark .ant-menu-sub {
-  color: rgba(255, 255, 255, 0.67);
+  color: #999;
   background: #404040;
 }
 .ant-menu-dark .ant-menu-inline.ant-menu-sub {
@@ -5007,9 +4888,8 @@ samp {
   top: 0;
 }
 .ant-menu-dark .ant-menu-item,
-.ant-menu-dark .ant-menu-item-group-title,
 .ant-menu-dark .ant-menu-item > a {
-  color: rgba(255, 255, 255, 0.67);
+  color: #999;
 }
 .ant-menu-dark.ant-menu-inline,
 .ant-menu-dark.ant-menu-vertical {
@@ -5024,7 +4904,6 @@ samp {
 .ant-menu-dark .ant-menu-item:hover,
 .ant-menu-dark .ant-menu-item-active,
 .ant-menu-dark .ant-menu-submenu-active,
-.ant-menu-dark:not(.ant-menu-inline) .ant-menu-submenu-open,
 .ant-menu-dark .ant-menu-submenu-selected,
 .ant-menu-dark .ant-menu-submenu:hover,
 .ant-menu-dark .ant-menu-submenu-title:hover {
@@ -5034,7 +4913,6 @@ samp {
 .ant-menu-dark .ant-menu-item:hover > a,
 .ant-menu-dark .ant-menu-item-active > a,
 .ant-menu-dark .ant-menu-submenu-active > a,
-.ant-menu-dark:not(.ant-menu-inline) .ant-menu-submenu-open > a,
 .ant-menu-dark .ant-menu-submenu-selected > a,
 .ant-menu-dark .ant-menu-submenu:hover > a,
 .ant-menu-dark .ant-menu-submenu-title:hover > a {
@@ -5048,19 +4926,9 @@ samp {
 .ant-menu-dark .ant-menu-item-selected > a:hover {
   color: #fff;
 }
-.ant-menu.ant-menu-dark .ant-menu-item-selected {
-  background-color: transparent;
-}
 .ant-menu-dark.ant-menu-inline .ant-menu-item-selected {
   background-color: #58a3ff;
 }
-.ant-menu-dark .ant-menu-item-disabled,
-.ant-menu-dark .ant-menu-submenu-disabled,
-.ant-menu-dark .ant-menu-item-disabled > a,
-.ant-menu-dark .ant-menu-submenu-disabled > a {
-  opacity: 0.8;
-  color: rgba(255, 255, 255, 0.35) !important;
-}
 .account-top {
   width: 100%;
   height: 84px;

File diff suppressed because it is too large
+ 4 - 9
build/admin/index.js


File diff suppressed because it is too large
+ 147 - 442
build/admin/login.css


File diff suppressed because it is too large
+ 4 - 9
build/admin/login.js


File diff suppressed because it is too large
+ 825 - 1299
build/admin/servicesManage/copyright.css


File diff suppressed because it is too large
+ 4 - 9
build/admin/servicesManage/copyright.js


File diff suppressed because it is too large
+ 825 - 1299
build/admin/servicesManage/highTech.css


File diff suppressed because it is too large
+ 4 - 9
build/admin/servicesManage/highTech.js


File diff suppressed because it is too large
+ 528 - 1213
build/admin/servicesManage/patent.css


File diff suppressed because it is too large
+ 4 - 9
build/admin/servicesManage/patent.js


File diff suppressed because it is too large
+ 589 - 1070
build/admin/userManage.css


File diff suppressed because it is too large
+ 4 - 9
build/admin/userManage.js


BIN
build/image/bg.jpg


File diff suppressed because it is too large
+ 250 - 605
build/user/account/index.css


File diff suppressed because it is too large
+ 4 - 9
build/user/account/index.js


File diff suppressed because it is too large
+ 725 - 1161
build/user/account/services.css


File diff suppressed because it is too large
+ 4 - 9
build/user/account/services.js


File diff suppressed because it is too large
+ 810 - 1282
build/user/account/set.css


File diff suppressed because it is too large
+ 4 - 9
build/user/account/set.js


File diff suppressed because it is too large
+ 270 - 759
build/user/certify.css


File diff suppressed because it is too large
+ 4 - 9
build/user/certify.js


File diff suppressed because it is too large
+ 270 - 759
build/user/groupCertify.css


File diff suppressed because it is too large
+ 4 - 9
build/user/groupCertify.js


BIN
build/user/image/bg.jpg


File diff suppressed because it is too large
+ 2 - 7
build/user/index.js


File diff suppressed because it is too large
+ 435 - 805
build/user/login.css


File diff suppressed because it is too large
+ 4 - 9
build/user/login.js


File diff suppressed because it is too large
+ 437 - 801
build/user/signIn.css


File diff suppressed because it is too large
+ 4 - 9
build/user/signIn.js


File diff suppressed because it is too large
+ 2 - 2
build/vendors.js


BIN
image/218894389504034269.jpg


BIN
image/bg.jpg


+ 4 - 3
js/component/account/services/intellectualDesc.jsx

@@ -1,7 +1,8 @@
 import React from 'react';
-import { Icon, Modal, Button, Form, message, Input, Spin, Select, DatePicker } from 'antd';
+import { Icon, Modal, Button, Form, message, Input, Spin, Select, DatePicker,Upload } from 'antd';
 import './patent.less';
 import { intellectualGetList, catagoryList } from '../../dataDic.js';
+import { beforeUploadFile } from '../../tools.js';
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
@@ -163,7 +164,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                             onChange={(data, dataString) => { this.state.authorizationDateFormattedDate = dataString }} />
                         )}
                 </FormItem>
-                <div className="hrSituation-roster">
+                <FormItem>
                     <Upload
                         name="ratepay"
                         action={globalConfig.context + "/techservice/cognizance/upload"}
@@ -183,7 +184,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                     >
                         <Button><Icon type="upload" /> 上传知识产权证书 </Button>
                     </Upload>
-                </div>
+                </FormItem>
                 <FormItem>
                     <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
                     <Button type="ghost" style={{ marginLeft: '20px' }} onClick={this.props.closeModal}>取消</Button>

+ 1 - 1
js/component/login/adminLogin.jsx

@@ -34,7 +34,7 @@ var Login = React.createClass({
                 }
             }).done(function (data) {
                 if (!data.error.length) {
-                    window.location.href = "index.html"
+                    window.location.href =  globalConfig.context + "/admin/userManage.html";
                 } else {
                     this.tips(data.error[0].message);
                 }

+ 25 - 7
js/component/login/login.less

@@ -1,11 +1,18 @@
 .wrap {
-    width: 960px;
+    width: 100%;
+    height: 100%;
+    min-height: 700px;
     margin: 0 auto;
-    .header {
+    position: relative;
+    background-image: url(../../../image/bg.jpg);
+    .login-header {
+        background: #fff;
+        box-shadow: 0 2px 6px 0px #ccc;
         .login-logo {
-            height: 80px;
+            padding: 20px;
+            overflow: hidden;
             width: 960px;
-            margin: 20px auto;
+            margin: 0 auto;
             .logo {
                 width: 80px;
                 padding-top: 60px;
@@ -41,11 +48,15 @@
         }
     }
     .content {
-        margin-top: 120px;
-        margin-bottom: 40px;
+        width: 960px;
+        height: 100%;
+        margin: 0 auto;
+        margin-top: 5%;
         .login-left {
+            display: none;
             float: left;
             margin-top: 54px;
+            background: #fff;
             img {
                 width: 520px;
                 height: 340px;
@@ -59,6 +70,9 @@
             .tabtwo {
                 margin-left: 40px;
             }
+            .ant-tabs {
+                background: #fff;
+            }
         }
         .login-form {
             .ant-checkbox-wrapper {
@@ -118,11 +132,15 @@
         }
     }
     .footer {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        width: 100%;
         padding-top: 20px;
         text-align: center;
+        background: #fff;
         p {
             margin: 10px 0;
         }
     }
-    
 }

+ 1 - 1
js/component/login/loginForm.jsx

@@ -31,7 +31,7 @@ const LoginForm = Form.create()(React.createClass({
                     }
                 }).done(function (data) {
                     if (!data.error.length) {
-                        window.location.href = "account/index.html"
+                        window.location.href = globalConfig.context + "/user/account/index.html";
                     } else {
                         message.warning(data.error[0].message);
                     }

+ 1 - 1
js/component/login/loginTop.jsx

@@ -5,7 +5,7 @@ import logo from '../../../image/logo.jpg';
 const LoginTop = React.createClass({
     render() {
         return (
-            <div className="header">
+            <div className="login-header">
                 <div className="login-logo">
                     <div className="logo">
                         <img src={logo} alt="" />

+ 7 - 3
js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx

@@ -27,6 +27,7 @@ const ActivityDesc = React.createClass({
             url: globalConfig.context + "/techservice/cognizance/activity",
             data: {
                 id: this.props.data.id,
+                uid:this.props.uid,
                 activityName: this.state.activityName,
                 activityNumber: this.state.activityNumber,
                 startDateFormattedDate: this.state.startDateFormattedDate,
@@ -306,21 +307,23 @@ const Activity = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/activityList",
+            url: globalConfig.context + "/api/admin/activityList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
+                uid:this.props.data.uid,
                 activityNumber: this.state.activityNumber,
                 activityName: this.state.activityName,
                 startDate: this.state.startDate,
                 endDate: this.state.endDate
             }
         }), $.ajax({
-            method: "get",
+            method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/intellectualList",
+            url: globalConfig.context + "/api/admin/intellectualList",
             data: {
+                uid:this.props.data.uid,
                 pageNo: pageNo || 1,
                 pageSize: 99,
             }
@@ -545,6 +548,7 @@ const Activity = React.createClass({
                     </Spin>
                 </div>
                 <ActivityDesc data={this.state.RowData}
+                    uid={this.props.data.uid}
                     mockData={this.state.mockData}
                     showDesc={this.state.showDesc} closeDesc={this.closeDesc} />
             </div >

+ 64 - 55
js/component/manageCenter/servicesManage/highTech/fosterDesc/content.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Button, Radio } from 'antd';
 import './content.less';
+import { getTime } from '../../../../tools';
 
 import Intellectual from './intellectual';
 import Activity from './activity';
@@ -34,64 +35,72 @@ const Content = React.createClass({
         });
     },
     render() {
-        return (
-            <div className="foster-desc" style={{ display: this.props.style }}>
-                <div className="content-tabs">
-                    <div className="foster-title">
-                        <span className="company-name">某某省某某市某某某公司</span>
-                        <span className="company-number">GF201712345678</span>
-                        <span className="company-time">有效期2014-10-02至2017-10-02</span>
-                        <Button className="foster-return" type="primary" onClick={this.returnFoster}>返回高企培育列表</Button>
+        if (this.props.data) {
+            return (
+                <div className="foster-desc" style={{ display: this.props.style }}>
+                    <div className="content-tabs">
+                        <div className="foster-title">
+                            <span className="company-name">{this.props.data.unitName}</span>
+                            <span className="company-number">{this.props.data.certificateNumber || ''}</span>
+                            {this.props.data.issuingDate ?
+                                <span className="company-time"> 有效期 {getTime(this.props.data.issuingDate)} 至 {getTime(this.props.data.issuingDate, 36)} </span> : ''
+                            }
+                            <Button className="foster-return" type="primary" onClick={this.returnFoster}>返回高企培育列表</Button>
+                        </div>
+                        <div className="clearfix foster-component">
+                            <Radio.Group onChange={this.onChange} defaultValue="orgTechCenter">
+                                <Radio.Button value="orgTechCenter">技术中心</Radio.Button>
+                                <Radio.Button value="activity">研发活动</Radio.Button>
+                                <Radio.Button value="activityCostList">研发活动费用详情</Radio.Button>
+                                <Radio.Button value="techProduct">高新技术产品</Radio.Button>
+                                <Radio.Button value="intellectual">知识产权</Radio.Button>
+                                <Radio.Button value="achievement">科技成果转化</Radio.Button>
+                                <Radio.Button value="ratepay">企业纳税申报</Radio.Button>
+                                <Radio.Button value="finance">财务报表</Radio.Button>
+                                <Radio.Button value="hrSituation">企业人员情况</Radio.Button>
+                                <Radio.Button value="honorList">企业荣誉及其他证明材料</Radio.Button>
+                                <Radio.Button value="standard">标准制定情况</Radio.Button>
+                                <Radio.Button value="innovationAbility">企业创新能力</Radio.Button>
+                            </Radio.Group>
+                        </div>
                     </div>
-                    <div className="clearfix foster-component">
-                        <Radio.Group onChange={this.onChange} defaultValue="orgTechCenter">
-                            <Radio.Button value="orgTechCenter">技术中心</Radio.Button>
-                            <Radio.Button value="activity">研发活动</Radio.Button>
-                            <Radio.Button value="activityCostList">研发活动费用详情</Radio.Button>
-                            <Radio.Button value="techProduct">高新技术产品</Radio.Button>
-                            <Radio.Button value="intellectual">知识产权</Radio.Button>
-                            <Radio.Button value="achievement">科技成果转化</Radio.Button>
-                            <Radio.Button value="ratepay">企业纳税申报</Radio.Button>
-                            <Radio.Button value="finance">财务报表</Radio.Button>
-                            <Radio.Button value="hrSituation">企业人员情况</Radio.Button>
-                            <Radio.Button value="honorList">企业荣誉及其他证明材料</Radio.Button>
-                            <Radio.Button value="standard">标准制定情况</Radio.Button>
-                            <Radio.Button value="innovationAbility">企业创新能力</Radio.Button>
-                        </Radio.Group>
+                    <div className="content-desc">
+                        {(() => {
+                            switch (this.state.radioKey) {
+                                case 'orgTechCenter':
+                                    return <OrgTechCenter data={this.props.data} />;
+                                case 'activity':
+                                    return <Activity data={this.props.data} />;
+                                case 'activityCostList':
+                                    return <ActivityCostList data={this.props.data} />;
+                                case 'techProduct':
+                                    return <TechProduct data={this.props.data} />;
+                                case 'intellectual':
+                                    return <Intellectual data={this.props.data} />;
+                                case 'achievement':
+                                    return <Achievement data={this.props.data} />;
+                                case 'ratepay':
+                                    return <Ratepay data={this.props.data} />;
+                                case 'finance':
+                                    return <Finance data={this.props.data} />;
+                                case 'hrSituation':
+                                    return <HrSituation data={this.props.data} />;
+                                case 'honorList':
+                                    return <HonorList data={this.props.data} />;
+                                case 'standard':
+                                    return <Standard data={this.props.data} />;
+                                case 'innovationAbility':
+                                    return <InnovationAbility data={this.props.data} />;
+                            };
+                        })()}
                     </div>
                 </div>
-                <div className="content-desc">
-                    {(() => {
-                        switch (this.state.radioKey) {
-                            case 'orgTechCenter':
-                                return <OrgTechCenter />;
-                            case 'activity':
-                                return <Activity />;
-                            case 'activityCostList':
-                                return <ActivityCostList />;
-                            case 'techProduct':
-                                return <TechProduct />;
-                            case 'intellectual':
-                                return <Intellectual />;
-                            case 'achievement':
-                                return <Achievement />;
-                            case 'ratepay':
-                                return <Ratepay />;
-                            case 'finance':
-                                return <Finance />;
-                            case 'hrSituation':
-                                return <HrSituation />;
-                            case 'honorList':
-                                return <HonorList />;
-                            case 'standard':
-                                return <Standard />;
-                            case 'innovationAbility':
-                                return <InnovationAbility />;
-                        };
-                    })()}
-                </div>
-            </div>
-        )
+            )
+        } else {
+            return (
+                <div></div>
+            )
+        }
     }
 });
 

+ 29 - 22
js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx

@@ -10,11 +10,11 @@ const PersonFrom = Form.create()(React.createClass({
     getData() {
         this.props.spinState(true);
         $.ajax({
-            method: "get",
+            method: "post",
             dataType: "json",
-            url: globalConfig.context + "/api/user/humanResource",
+            url: globalConfig.context + "/api/admin/orgHumanResource",
             data: {
-                uid:this.props.uid,
+                uid: this.props.uid,
                 year: this.props.year
             },
             success: function (data) {
@@ -88,8 +88,9 @@ const PersonFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/api/user/SaveHumanResource",
+                    url: globalConfig.context + "/api/admin/updateOrgHumanResource",
                     data: {
+                        uid: this.props.uid,
                         year: this.props.year,
                         aboveFifty: values.aboveFifty,
                         belowThirty: values.belowThirty,
@@ -503,25 +504,31 @@ const Person = React.createClass({
     },
     render() {
         const theYear = (new Date()).getFullYear() - 1;
-        return (
-            <Spin spinning={this.state.loading} className='spin-box'>
-                <div className="set-person">
-                    <div className="acc-detail">
-                        <Tabs defaultActiveKey={String(theYear)} >
-                            <Tabs.TabPane tab={theYear} key={theYear}>
-                                <PersonFrom year={theYear} spinState={this.spinChange} urlData={this.urlData} />
-                            </Tabs.TabPane>
-                            <Tabs.TabPane tab={theYear - 1} key={theYear - 1}>
-                                <PersonFrom year={theYear - 1} spinState={this.spinChange} urlData={this.urlData} />
-                            </Tabs.TabPane>
-                            <Tabs.TabPane tab={theYear - 2} key={theYear - 2}>
-                                <PersonFrom year={theYear - 2} spinState={this.spinChange} urlData={this.urlData} />
-                            </Tabs.TabPane>
-                        </Tabs>
+        if (this.props.data) {
+            return (
+                <Spin spinning={this.state.loading} className='spin-box'>
+                    <div className="set-person">
+                        <div className="acc-detail">
+                            <Tabs defaultActiveKey={String(theYear)} >
+                                <Tabs.TabPane tab={theYear} key={theYear}>
+                                    <PersonFrom year={theYear} uid={this.props.data.uid} spinState={this.spinChange} urlData={this.urlData} />
+                                </Tabs.TabPane>
+                                <Tabs.TabPane tab={theYear - 1} uid={this.props.data.uid} key={theYear - 1}>
+                                    <PersonFrom year={theYear - 1} spinState={this.spinChange} urlData={this.urlData} />
+                                </Tabs.TabPane>
+                                <Tabs.TabPane tab={theYear - 2} uid={this.props.data.uid} key={theYear - 2}>
+                                    <PersonFrom year={theYear - 2} spinState={this.spinChange} urlData={this.urlData} />
+                                </Tabs.TabPane>
+                            </Tabs>
+                        </div>
                     </div>
-                </div>
-            </Spin>
-        )
+                </Spin>
+            )
+        } else {
+            return (
+                <div></div>
+            )
+        }
     }
 });
 

+ 3 - 2
js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectual.jsx

@@ -15,13 +15,14 @@ const Intellectual = React.createClass({
             loading: true
         });
         $.ajax({
-            method: "get",
+            method: "post",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context + "/api/admin/intellectualList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
+                uid: this.props.data.uid,
                 startDate: this.state.startDateFormattedDate,
                 endDate: this.state.endDateFormattedDate
             }
@@ -209,7 +210,7 @@ const Intellectual = React.createClass({
                             onRowClick={this.tableRowClick} />
                     </Spin>
                 </div>
-                <IntellectualDesc data={this.state.RowData} showDesc={this.state.showDesc} closeDesc={this.closeDesc} />
+                <IntellectualDesc uid={this.props.data.uid} data={this.state.RowData} showDesc={this.state.showDesc} closeDesc={this.closeDesc} />
             </div >
         );
     }

+ 7 - 5
js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectualDesc.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
-import { Icon, Modal, Button, Form, message, Input, Spin, Select, DatePicker } from 'antd';
+import { Icon, Modal, Button, Form, message, Input, Spin, Select, DatePicker,Upload } from 'antd';
 import { intellectualGetList, catagoryList } from '../../../../dataDic.js';
+import { beforeUploadFile } from '../../../../tools.js';
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
@@ -35,9 +36,10 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/intellectual",
+                    url: globalConfig.context + "/api/admin/intellectual",
                     data: {
                         id: this.props.data.id,
+                        uid:this.props.uid,
                         intellectualPropertyNumber: values.intellectualPropertyNumber,
                         intellectualPropertyName: values.intellectualPropertyName,
                         catagory: values.catagory,
@@ -162,7 +164,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                             onChange={(data, dataString) => { this.state.authorizationDateFormattedDate = dataString }} />
                         )}
                 </FormItem>
-                <div className="hrSituation-roster">
+                <FormItem>
                     <Upload
                         name="ratepay"
                         action={globalConfig.context + "/techservice/cognizance/upload"}
@@ -182,7 +184,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                     >
                         <Button><Icon type="upload" /> 上传知识产权证书 </Button>
                     </Upload>
-                </div>
+                </FormItem>
                 <FormItem>
                     <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
                     <Button type="ghost" style={{ marginLeft: '20px' }} onClick={this.props.closeModal}>取消</Button>
@@ -234,7 +236,7 @@ const intellectualDesc = React.createClass({
                         width='600px'
                         footer=''
                     >
-                        <IntellectualDescFrom data={this.props.data} spinState={this.spinChange} closeModal={this.handleCancel} />
+                        <IntellectualDescFrom uid={this.props.uid} data={this.props.data} spinState={this.spinChange} closeModal={this.handleCancel} />
                     </Modal>
                 </Spin>
             </div>

+ 5 - 3
js/component/manageCenter/servicesManage/highTech/fosterDesc/standard.jsx

@@ -19,9 +19,10 @@ const StandardDesc = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/developStandard",
+            url: globalConfig.context + "/api/admin/developStandard",
             data: {
                 id: this.props.data.id,
+                uid:this.props.uid,
                 standardName: this.state.standardName,
                 standardNumber: this.state.standardNumber,
                 standardLevel: this.state.standardLevel,
@@ -121,10 +122,11 @@ const Standard = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/standard",
+            url: globalConfig.context + "/api/admin/standard",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
+                uid:this.props.data.uid,
                 standardName: this.state.standardName,
                 standardNumber: this.state.standardNumber,
                 standardLevel: this.state.standardLevel,
@@ -328,7 +330,7 @@ const Standard = React.createClass({
                             onRowClick={this.tableRowClick} />
                     </Spin>
                 </div>
-                <StandardDesc data={this.state.RowData} showDesc={this.state.showDesc} closeDesc={this.closeDesc} />
+                <StandardDesc uid={this.props.data.uid} data={this.state.RowData} showDesc={this.state.showDesc} closeDesc={this.closeDesc} />
             </div >
         );
     }

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/highTechFoster.jsx

@@ -232,7 +232,7 @@ const Patent = React.createClass({
                     </div>
                 </div >
                 <FosterDesc style={this.state.fosterDescDisplay}
-                    companyId={this.state.companyId}
+                    data={this.state.RowData}
                     returnBtn={this.returnBtn} />
             </div>
         );

+ 1 - 1
package.json

@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "webpack --progress --colors",
     "pro": "webpack --config webpack.config.pro.js --progress --colors",
-    "dev": "webpack-dev-server --port 8000 --devtool eval --progress --colors --hot --content-base build"
+    "dev": "webpack-dev-server --port 80 --devtool eval --progress --colors --hot --content-base build"
   },
   "repository": {
     "type": "git",

+ 12 - 12
webpack.config.js

@@ -12,55 +12,55 @@ let theme = {
 
 module.exports = {
     entry: {
-        'user/index': ['webpack-dev-server/client?http://127.0.0.1:8000', // WebpackDevServer host and port
+        'user/index': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './js/user/index.js'
         ],
-        'user/login': ['webpack-dev-server/client?http://127.0.0.1:8000', // WebpackDevServer host and port
+        'user/login': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './js/user/login.js'
         ],
-        'user/signIn': ['webpack-dev-server/client?http://127.0.0.1:8000', // WebpackDevServer host and port
+        'user/signIn': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './js/user/signIn.js'
         ],
-        'user/certify': ['webpack-dev-server/client?http://127.0.0.1:8000', // WebpackDevServer host and port
+        'user/certify': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './js/user/certify.js'
         ],
-        'user/groupCertify': ['webpack-dev-server/client?http://127.0.0.1:8000', // WebpackDevServer host and port
+        'user/groupCertify': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './js/user/groupCertify.js'
         ],
         //user-account
-        'user/account/index': ['webpack-dev-server/client?http://127.0.0.1:8000', // WebpackDevServer host and port
+        'user/account/index': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './js/user/account/index.js'
         ],
-        'user/account/set': ['webpack-dev-server/client?http://127.0.0.1:8000', // WebpackDevServer host and port
+        'user/account/set': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './js/user/account/set.js'
         ],
-        'user/account/services': ['webpack-dev-server/client?http://127.0.0.1:8000', // WebpackDevServer host and port
+        'user/account/services': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './js/user/account/services.js'
         ],
 
 
         //admin
-        'admin/index': ['webpack-dev-server/client?http://127.0.0.1:8000', // WebpackDevServer host and port
+        'admin/index': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './js/admin/index.js'
         ],
-        'admin/login': ['webpack-dev-server/client?http://127.0.0.1:8000', // WebpackDevServer host and port
+        'admin/login': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './js/admin/login.js'
         ],
-        'admin/userManage': ['webpack-dev-server/client?http://127.0.0.1:8000', // WebpackDevServer host and port
+        'admin/userManage': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './js/admin/userManage.js'
         ],
-        'admin/servicesManage/patent': ['webpack-dev-server/client?http://127.0.0.1:8000', // WebpackDevServer host and port
+        'admin/servicesManage/patent': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './js/admin/servicesManage/patent.js'
         ],