Selaa lähdekoodia

高企培育接口对接

yee 8 vuotta sitten
vanhempi
commit
48b11c2758
56 muutettua tiedostoa jossa 548 lisäystä ja 116994 poistoa
  1. 0 5310
      build/1.0.0/admin/index.css
  2. 0 32
      build/1.0.0/admin/index.html
  3. 0 35
      build/1.0.0/admin/index.js
  4. 0 3729
      build/1.0.0/admin/login.css
  5. 0 32
      build/1.0.0/admin/login.html
  6. 0 35
      build/1.0.0/admin/login.js
  7. 0 12401
      build/1.0.0/admin/servicesManage/copyright.css
  8. 0 32
      build/1.0.0/admin/servicesManage/copyright.html
  9. 0 35
      build/1.0.0/admin/servicesManage/copyright.js
  10. 0 12401
      build/1.0.0/admin/servicesManage/highTech.css
  11. 0 32
      build/1.0.0/admin/servicesManage/highTech.html
  12. 0 35
      build/1.0.0/admin/servicesManage/highTech.js
  13. 0 11743
      build/1.0.0/admin/servicesManage/patent.css
  14. 0 32
      build/1.0.0/admin/servicesManage/patent.html
  15. 0 35
      build/1.0.0/admin/servicesManage/patent.js
  16. 0 11052
      build/1.0.0/admin/userManage.css
  17. 0 32
      build/1.0.0/admin/userManage.html
  18. 0 35
      build/1.0.0/admin/userManage.js
  19. BIN
      build/1.0.0/image/bg.jpg
  20. 0 6321
      build/1.0.0/user/account/index.css
  21. 0 32
      build/1.0.0/user/account/index.html
  22. 0 35
      build/1.0.0/user/account/index.js
  23. 0 12146
      build/1.0.0/user/account/services.css
  24. 0 32
      build/1.0.0/user/account/services.html
  25. 0 35
      build/1.0.0/user/account/services.js
  26. 0 11382
      build/1.0.0/user/account/set.css
  27. 0 32
      build/1.0.0/user/account/set.html
  28. 0 35
      build/1.0.0/user/account/set.js
  29. 0 7188
      build/1.0.0/user/certify.css
  30. 0 32
      build/1.0.0/user/certify.html
  31. 0 35
      build/1.0.0/user/certify.js
  32. 0 7185
      build/1.0.0/user/groupCertify.css
  33. 0 32
      build/1.0.0/user/groupCertify.html
  34. 0 35
      build/1.0.0/user/groupCertify.js
  35. 0 32
      build/1.0.0/user/index.html
  36. 0 20
      build/1.0.0/user/index.js
  37. 0 7266
      build/1.0.0/user/login.css
  38. 0 32
      build/1.0.0/user/login.html
  39. 0 35
      build/1.0.0/user/login.js
  40. 0 7671
      build/1.0.0/user/signIn.css
  41. 0 32
      build/1.0.0/user/signIn.html
  42. 0 35
      build/1.0.0/user/signIn.js
  43. 0 24
      build/1.0.0/vendors.js
  44. 16 18
      entry.js
  45. 13 6
      js/component/manageCenter/servicesManage/highTech/fosterDesc/achievement.jsx
  46. 22 10
      js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx
  47. 20 9
      js/component/manageCenter/servicesManage/highTech/fosterDesc/activityCostList.jsx
  48. 98 46
      js/component/manageCenter/servicesManage/highTech/fosterDesc/content.jsx
  49. 296 106
      js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx
  50. 0 0
      js/component/manageCenter/servicesManage/highTech/fosterDesc/innovationAbility.jsx
  51. 13 7
      js/component/manageCenter/servicesManage/highTech/fosterDesc/ratepay.jsx
  52. 23 11
      js/component/manageCenter/servicesManage/highTech/fosterDesc/techProduct.jsx
  53. 23 15
      js/component/manageCenter/userManage/content.jsx
  54. 20 19
      js/component/manageCenter/userManage/orgList.jsx
  55. 2 2
      package.json
  56. 2 3
      webpack.config.js

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 5310
build/1.0.0/admin/index.css


+ 0 - 32
build/1.0.0/admin/index.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        管理员-首页
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="http://aftts.hnzhiming.com/1.0.0/admin/index.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/admin/index.js"></script><script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/vendors.js"></script></body>
-
-</html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 35
build/1.0.0/admin/index.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 3729
build/1.0.0/admin/login.css


+ 0 - 32
build/1.0.0/admin/login.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        管理员-登录
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="http://aftts.hnzhiming.com/1.0.0/admin/login.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/admin/login.js"></script><script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/vendors.js"></script></body>
-
-</html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 35
build/1.0.0/admin/login.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 12401
build/1.0.0/admin/servicesManage/copyright.css


+ 0 - 32
build/1.0.0/admin/servicesManage/copyright.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        管理员-科技服务管理-软著
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="http://aftts.hnzhiming.com/1.0.0/admin/servicesManage/copyright.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/admin/servicesManage/copyright.js"></script><script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/vendors.js"></script></body>
-
-</html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 35
build/1.0.0/admin/servicesManage/copyright.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 12401
build/1.0.0/admin/servicesManage/highTech.css


+ 0 - 32
build/1.0.0/admin/servicesManage/highTech.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        管理员-科技服务管理-高企
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="http://aftts.hnzhiming.com/1.0.0/admin/servicesManage/highTech.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/admin/servicesManage/highTech.js"></script><script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/vendors.js"></script></body>
-
-</html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 35
build/1.0.0/admin/servicesManage/highTech.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 11743
build/1.0.0/admin/servicesManage/patent.css


+ 0 - 32
build/1.0.0/admin/servicesManage/patent.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        管理员-科技服务管理-专利
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="http://aftts.hnzhiming.com/1.0.0/admin/servicesManage/patent.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/admin/servicesManage/patent.js"></script><script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/vendors.js"></script></body>
-
-</html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 35
build/1.0.0/admin/servicesManage/patent.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 11052
build/1.0.0/admin/userManage.css


+ 0 - 32
build/1.0.0/admin/userManage.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        管理员-用户管理
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="http://aftts.hnzhiming.com/1.0.0/admin/userManage.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/admin/userManage.js"></script><script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/vendors.js"></script></body>
-
-</html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 35
build/1.0.0/admin/userManage.js


BIN
build/1.0.0/image/bg.jpg


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 6321
build/1.0.0/user/account/index.css


+ 0 - 32
build/1.0.0/user/account/index.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        用户中心-首页
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="http://aftts.hnzhiming.com/1.0.0/user/account/index.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/user/account/index.js"></script><script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/vendors.js"></script></body>
-
-</html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 35
build/1.0.0/user/account/index.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 12146
build/1.0.0/user/account/services.css


+ 0 - 32
build/1.0.0/user/account/services.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        用户中心-科技服务
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="http://aftts.hnzhiming.com/1.0.0/user/account/services.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/user/account/services.js"></script><script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/vendors.js"></script></body>
-
-</html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 35
build/1.0.0/user/account/services.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 11382
build/1.0.0/user/account/set.css


+ 0 - 32
build/1.0.0/user/account/set.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        用户中心-设置
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="http://aftts.hnzhiming.com/1.0.0/user/account/set.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/user/account/set.js"></script><script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/vendors.js"></script></body>
-
-</html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 35
build/1.0.0/user/account/set.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 7188
build/1.0.0/user/certify.css


+ 0 - 32
build/1.0.0/user/certify.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        个人用户认证
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="http://aftts.hnzhiming.com/1.0.0/user/certify.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/user/certify.js"></script><script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/vendors.js"></script></body>
-
-</html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 35
build/1.0.0/user/certify.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 7185
build/1.0.0/user/groupCertify.css


+ 0 - 32
build/1.0.0/user/groupCertify.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        团体用户认证
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="http://aftts.hnzhiming.com/1.0.0/user/groupCertify.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/user/groupCertify.js"></script><script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/vendors.js"></script></body>
-
-</html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 35
build/1.0.0/user/groupCertify.js


+ 0 - 32
build/1.0.0/user/index.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        用户首页
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-</head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/user/index.js"></script><script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/vendors.js"></script></body>
-
-</html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 20
build/1.0.0/user/index.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 7266
build/1.0.0/user/login.css


+ 0 - 32
build/1.0.0/user/login.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        用户登录
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="http://aftts.hnzhiming.com/1.0.0/user/login.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/user/login.js"></script><script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/vendors.js"></script></body>
-
-</html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 35
build/1.0.0/user/login.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 7671
build/1.0.0/user/signIn.css


+ 0 - 32
build/1.0.0/user/signIn.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        用户注册
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="http://aftts.hnzhiming.com/1.0.0/user/signIn.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/user/signIn.js"></script><script type="text/javascript" src="http://aftts.hnzhiming.com/1.0.0/vendors.js"></script></body>
-
-</html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 35
build/1.0.0/user/signIn.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 24
build/1.0.0/vendors.js


+ 16 - 18
entry.js

@@ -17,68 +17,66 @@ module.exports = {
     //admin-servicesManage
     'admin/servicesManage/patent': './js/admin/servicesManage/patent.js',
     'admin/servicesManage/copyright': './js/admin/servicesManage/copyright.js',
-    'admin/servicesManage/highTech': './js/admin/servicesManage/highTech.js',
-    vendors: ['jquery']
+    'admin/servicesManage/highTech': './js/admin/servicesManage/highTech.js'
   },
   watch: {
-    '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'
     ],
-    'admin/servicesManage/copyright': ['webpack-dev-server/client?http://127.0.0.1:8000', // WebpackDevServer host and port
+    'admin/servicesManage/copyright': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/admin/servicesManage/copyright.js'
     ],
-    'admin/servicesManage/highTech': ['webpack-dev-server/client?http://127.0.0.1:8000', // WebpackDevServer host and port
+    'admin/servicesManage/highTech': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/admin/servicesManage/highTech.js'
-    ],
-    vendors: ['jquery', 'antd']
+    ]
   }
 }

+ 13 - 6
js/component/manageCenter/servicesManage/highTech/fosterDesc/achievement.jsx

@@ -54,9 +54,10 @@ const AchievementDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/disposeAchievement",
+                    url: globalConfig.context + "/api/admin/disposeAchievement",
                     data: {
                         id: this.props.data.id,
+                        uid: this.props.uid,
                         achievementName: values.achievementName,
                         source: values.source,
                         conversionForm: values.conversionForm,
@@ -220,6 +221,7 @@ const AchievementDesc = React.createClass({
                         footer=''
                     >
                         <AchievementDescFrom
+                            uid={this.props.uid}
                             data={this.props.data}
                             activityNumberList={this.props.activityNumberList}
                             spinState={this.spinChange} closeModal={this.handleCancel} />
@@ -237,19 +239,23 @@ const Achievement = React.createClass({
             loading: true
         });
         $.when($.ajax({
-            method: "get",
+            method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/achievementList",
+            url: globalConfig.context + "/api/admin/achievementList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
+                uid:this.props.data.uid
             }
         }), $.ajax({
-            method: "get",
+            method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/activityNumber",
+            url: globalConfig.context + "/api/admin/activityNumber",
+            data:{
+                uid:this.props.data.uid
+            }
         })).done((data1, data2) => {
             let data = data1[0];
             let activityNumber = data2[0];
@@ -265,7 +271,7 @@ const Achievement = React.createClass({
                 let thisdata = data.data.list[i];
                 this.state.data.push({
                     key: i,
-                    id:thisdata.id,
+                    id: thisdata.id,
                     uid: thisdata.uid,
                     achievementName: thisdata.achievementName,
                     source: thisdata.source,
@@ -428,6 +434,7 @@ const Achievement = React.createClass({
                 </div>
                 <AchievementDesc
                     data={this.state.RowData}
+                    uid={this.props.data.uid}
                     activityNumberList={this.state.activityNumberList}
                     showDesc={this.state.showDesc} closeDesc={this.closeDesc} />
             </div >

+ 22 - 10
js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx

@@ -27,7 +27,7 @@ const ActivityDesc = React.createClass({
             url: globalConfig.context + "/techservice/cognizance/activity",
             data: {
                 id: this.props.data.id,
-                uid:this.props.uid,
+                uid: this.props.uid,
                 activityName: this.state.activityName,
                 activityNumber: this.state.activityNumber,
                 startDateFormattedDate: this.state.startDateFormattedDate,
@@ -64,7 +64,8 @@ const ActivityDesc = React.createClass({
                         thirdYearExpenditure: this.state.thirdYearExpenditure,
                         implement: this.state.implement,
                         technologyInnovation: this.state.technologyInnovation,
-                        achievement: this.state.achievement
+                        achievement: this.state.achievement,
+                        projectMode: this.state.projectMode
                     });
                 } else if (data.error.length && data.error[0].message) {
                     message.warning(data.error[0].message);
@@ -109,6 +110,7 @@ const ActivityDesc = React.createClass({
             this.state.implement = nextProps.data.implement;
             this.state.technologyInnovation = nextProps.data.technologyInnovation;
             this.state.achievement = nextProps.data.achievement;
+            this.state.projectMode = nextProps.data.projectMode;
             this.state.mockData = nextProps.data.mockData;
         };
     },
@@ -178,7 +180,7 @@ const ActivityDesc = React.createClass({
                         <div className="half-div">
                             <p>参与人员:</p>
                             <InputNumber value={this.state.participant}
-                                onChange={(e) => { this.setState({ participant: e.target.value }); }} />
+                                onChange={(e) => { this.setState({ participant: e }); }} />
                         </div>
                         <div style={{ marginTop: '10px' }}>
                             <p>知识产权编号:</p>
@@ -261,9 +263,9 @@ const ActivityDesc = React.createClass({
                             </div>
                         </div>
                         <Select style={{ width: 120 }}
-                        placeholder='请选择立项类型'
-                        value={this.state.lixiang}
-                        onChange={(e)=>{this.setState({lixiang:e});}}>
+                            placeholder='请选择立项类型'
+                            value={this.state.projectMode}
+                            onChange={(e) => { this.setState({ projectMode: e }); }}>
                             <Select.Option value='0'>内部立项</Select.Option>
                             <Select.Option value='1'>外部立项</Select.Option>
                         </Select>
@@ -311,11 +313,11 @@ const Activity = React.createClass({
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
-                uid:this.props.data.uid,
+                uid: this.props.data.uid,
                 activityNumber: this.state.activityNumber,
                 activityName: this.state.activityName,
-                startDate: this.state.startDate,
-                endDate: this.state.endDate
+                startDateFormattedDate: this.state.startDateFormattedDate,
+                endDateFormattedDate: this.state.endDateFormattedDate
             }
         }), $.ajax({
             method: "post",
@@ -323,7 +325,7 @@ const Activity = React.createClass({
             crossDomain: false,
             url: globalConfig.context + "/api/admin/intellectualList",
             data: {
-                uid:this.props.data.uid,
+                uid: this.props.data.uid,
                 pageNo: pageNo || 1,
                 pageSize: 99,
             }
@@ -505,6 +507,8 @@ const Activity = React.createClass({
     reset() {
         this.state.activityName = undefined;
         this.state.activityNumber = undefined;
+        this.state.startDateFormattedDate = undefined;
+        this.state.endDateFormattedDate = undefined;
         this.loadData();
     },
     render() {
@@ -528,6 +532,14 @@ const Activity = React.createClass({
                         onChange={(e) => { this.setState({ activityName: e.target.value }); }} />
                     <Input placeholder="研发活动编号" value={this.state.activityNumber}
                         onChange={(e) => { this.setState({ activityNumber: e.target.value }); }} />
+                    <span>开始日期:</span>
+                    <DatePicker
+                        value={this.state.startDateFormattedDate ? moment(this.state.startDateFormattedDate) : null}
+                        onChange={(data, dataString) => { this.setState({ startDateFormattedDate: dataString }); }} />
+                    <span>结束日期:</span>
+                    <DatePicker
+                        value={this.state.endDateFormattedDate ? moment(this.state.endDateFormattedDate) : null}
+                        onChange={(data, dataString) => { this.setState({ endDateFormattedDate: dataString }); }} />
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <p>

+ 20 - 9
js/component/manageCenter/servicesManage/highTech/fosterDesc/activityCostList.jsx

@@ -49,10 +49,11 @@ const ActivityDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/activityCost",
+                    url: globalConfig.context + "/api/admin/activityCost",
                     data: {
                         id: this.props.data.id,
                         aid: this.state.aid,
+                        uid:this.props.uid,
                         activityNumber: this.state.activityNumber,
 
                         internalLaborCost: values.internalLaborCost,
@@ -334,7 +335,10 @@ const ActivityDesc = React.createClass({
                         width='800px'
                         footer=''
                     >
-                        <ActivityDescFrom data={this.props.data} activityNumberList={this.props.activityNumberList}
+                        <ActivityDescFrom 
+                        uid={this.props.uid}
+                        data={this.props.data} 
+                        activityNumberList={this.props.activityNumberList}
                             spinState={this.spinChange} closeModal={this.handleCancel} />
                     </Modal>
                 </Spin>
@@ -353,19 +357,23 @@ const Activity = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/activityCostList",
+            url: globalConfig.context + "/api/admin/activityCostList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
+                uid:this.props.data.uid,
                 activityNumber: this.state.activityNumber,
-                startDate: this.state.startDate,
-                endDate: this.state.endDate
+                startDate: this.state.startDateFormattedDate,
+                endDate: this.state.endDateFormattedDate
             }
         }), $.ajax({
-            method: "get",
+            method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/activityNumber",
+            url: globalConfig.context + "/api/admin/activityNumber",
+            data:{
+                uid:this.props.data.uid
+            }
         })).done((data1, data2) => {
             let data = data1[0];
             let activityNumber = data2[0];
@@ -561,6 +569,7 @@ const Activity = React.createClass({
         this.loadData();
     },
     search() {
+
         this.loadData();
     },
     reset() {
@@ -583,7 +592,7 @@ const Activity = React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-                    <span>企业研究开发活动情表</span>
+                    <span>企业研究开发活动费用详情表</span>
                 </div>
                 <div className="user-search">
                     <Input placeholder="研发活动编号" value={this.state.activityNumber}
@@ -615,7 +624,9 @@ const Activity = React.createClass({
                             onRowClick={this.tableRowClick} />
                     </Spin>
                 </div>
-                <ActivityDesc data={this.state.RowData}
+                <ActivityDesc 
+                    uid={this.props.data.uid}
+                data={this.state.RowData}
                     activityNumberList={this.state.activityNumberList}
                     showDesc={this.state.showDesc} closeDesc={this.closeDesc} />
             </div >

+ 98 - 46
js/component/manageCenter/servicesManage/highTech/fosterDesc/content.jsx

@@ -2,37 +2,116 @@ import React from 'react';
 import { Button, Radio } from 'antd';
 import './content.less';
 import { getTime } from '../../../../tools';
-
-import Intellectual from './intellectual';
-import Activity from './activity';
-import Standard from './standard';
-import ActivityCostList from './activityCostList';
-import TechProduct from './techProduct';
-import Ratepay from './ratepay';
-import Finance from './finance';
-import Achievement from './achievement';
-import HonorList from './honorList';
 import OrgTechCenter from './orgTechCenter';
-import InnovationAbility from './ablt';
-import HrSituation from './hrSituation';
+
 
 
 const Content = React.createClass({
     getInitialState() {
         return {
             loading: false,
-            radioKey: 'hrSituation',
+            component: OrgTechCenter
         };
     },
-    componentWillMount() {
-    },
     returnFoster() {
         this.props.returnBtn();
     },
     onChange(e) {
-        this.setState({
-            radioKey: e.target.value
-        });
+        switch (e.target.value) {
+            case 'orgTechCenter':
+                this.setState({
+                    component: OrgTechCenter
+                });
+                break;
+            case 'activity':
+                require.ensure([], () => {
+                    const Activity = require('./activity').default;
+                    this.setState({
+                        component: Activity
+                    });
+                });
+                break;
+            case 'activityCostList':
+                require.ensure([], () => {
+                    const ActivityCostList = require('./activityCostList').default;
+                    this.setState({
+                        component: ActivityCostList
+                    });
+                });
+                break;
+            case 'techProduct':
+                require.ensure([], () => {
+                    const TechProduct = require('./techProduct').default;
+                    this.setState({
+                        component: TechProduct
+                    });
+                });
+                break;
+            case 'intellectual':
+                require.ensure([], () => {
+                    const Intellectual = require('./intellectual').default;
+                    this.setState({
+                        component: Intellectual
+                    });
+                });
+                break;
+            case 'achievement':
+                require.ensure([], () => {
+                    const Achievement = require('./achievement').default;
+                    this.setState({
+                        component: Achievement
+                    });
+                });
+                break;
+            case 'ratepay':
+                require.ensure([], () => {
+                    const Ratepay = require('./ratepay').default;
+                    this.setState({
+                        component: Ratepay
+                    });
+                });
+                break;
+            case 'finance':
+                require.ensure([], () => {
+                    const Finance = require('./finance').default;
+                    this.setState({
+                        component: Finance
+                    });
+                });
+                break;
+            case 'hrSituation':
+                require.ensure([], () => {
+                    const HrSituation = require('./hrSituation').default;
+                    this.setState({
+                        component: HrSituation
+                    });
+                });
+                break;
+            case 'honorList':
+                require.ensure([], () => {
+                    const HonorList = require('./honorList').default;
+                    this.setState({
+                        component: HonorList
+                    });
+                });
+                break;
+            case 'standard':
+                require.ensure([], () => {
+                    const Standard = require('./standard').default;
+                    this.setState({
+                        component: Standard
+                    });
+                });
+                break;
+            case 'innovationAbility':
+                require.ensure([], () => {
+                    const InnovationAbility = require('./innovationAbility').default;
+                    this.setState({
+                        component: InnovationAbility
+                    });
+                });
+                break;
+        };
     },
     render() {
         if (this.props.data) {
@@ -65,34 +144,7 @@ const Content = React.createClass({
                         </div>
                     </div>
                     <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} />;
-                            };
-                        })()}
+                        <this.state.component data={this.props.data} />
                     </div>
                 </div>
             )

+ 296 - 106
js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx

@@ -1,58 +1,12 @@
 import React from 'react';
-import { Input, InputNumber, Button, Form, Icon, Spin, message, Tabs, Upload } from 'antd';
+import { Input, InputNumber, Button, Form, Icon, Spin, message, Table, Modal, Upload } from 'antd';
 import { beforeUpload } from '../../../../tools.js';
 import './hrSituation.less'
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 
 
-const PersonFrom = Form.create()(React.createClass({
-    getData() {
-        this.props.spinState(true);
-        $.ajax({
-            method: "post",
-            dataType: "json",
-            url: globalConfig.context + "/api/admin/orgHumanResource",
-            data: {
-                uid: this.props.uid,
-                year: this.props.year
-            },
-            success: function (data) {
-                if (data.data) {
-                    this.setState({
-                        aboveFifty: data.data.aboveFifty,
-                        belowThirty: data.data.belowThirty,
-                        college: data.data.college,
-                        doctor: data.data.doctor,
-                        firmAbroad: data.data.firmAbroad,
-                        firmCore: data.data.firmCore,
-                        firmForeign: data.data.firmForeign,
-                        firmInService: data.data.firmInService,
-                        firmPartTime: data.data.firmPartTime,
-                        firmTemporary: data.data.firmTemporary,
-                        firmTotal: data.data.firmTotal,
-                        fortyoneToFifty: data.data.fortyoneToFifty,
-                        intermediateTitle: data.data.intermediateTitle,
-                        juniorTitle: data.data.juniorTitle,
-                        master: data.data.master,
-                        seniorMechanic: data.data.seniorMechanic,
-                        seniorTitle: data.data.seniorTitle,
-                        techAbroad: data.data.techAbroad,
-                        techCore: data.data.techCore,
-                        techForeign: data.data.techForeign,
-                        techInService: data.data.techInService,
-                        techPartTime: data.data.techPartTime,
-                        techTemporary: data.data.techTemporary,
-                        techTotal: data.data.techTotal,
-                        thirtyoneToThirtyfour: data.data.thirtyoneToThirtyfour,
-                        undergraduate: data.data.undergraduate
-                    });
-                }
-            }.bind(this),
-        }).always(function () {
-            this.props.spinState(false);
-        }.bind(this));
-    },
+const HrSituationDescFrom = Form.create()(React.createClass({
     getInitialState() {
         return {
             loading: false
@@ -82,6 +36,10 @@ const PersonFrom = Form.create()(React.createClass({
                 message.warning("全体人员结构中年龄一栏人数总和小于等于职工人数!");
                 return;
             };
+            if (values.year) {
+                message.warning("请输入年份!");
+                return;
+            }
             if (!err) {
                 this.props.spinState(true);
                 $.ajax({
@@ -90,8 +48,9 @@ const PersonFrom = Form.create()(React.createClass({
                     crossDomain: false,
                     url: globalConfig.context + "/api/admin/updateOrgHumanResource",
                     data: {
-                        uid: this.props.uid,
-                        year: this.props.year,
+                        id: this.props.data.id,
+                        uid: this.props.data.uid,
+                        year: values.data.year,
                         aboveFifty: values.aboveFifty,
                         belowThirty: values.belowThirty,
                         college: values.college,
@@ -124,18 +83,17 @@ const PersonFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
+                        this.props.closeModal();
+                        this.props.spinState(false);
+                        this.props.form.resetFields();
                     } else {
                         message.warning(data.error[0].message);
+                        this.props.spinState(false);
                     }
-                }.bind(this)).always(function () {
-                    this.props.spinState(false);
                 }.bind(this));
             }
         });
     },
-    componentWillMount() {
-        this.getData();
-    },
     render() {
         const { getFieldDecorator } = this.props.form;
         const formItemLayout = {
@@ -145,6 +103,18 @@ const PersonFrom = Form.create()(React.createClass({
         const FormItem = Form.Item;
         return (
             <Form onSubmit={this.handleSubmit} className="hrSituation-form">
+                <div className="clearfix">
+                    <FormItem className="half-item"
+                        {...formItemLayout}
+                        label="年份"
+                    >
+                        {getFieldDecorator('year', {
+                            initialValue: this.props.data.year || null
+                        })(
+                            <InputNumber />
+                            )}
+                    </FormItem>
+                </div>
                 <p className="hrSituation-title">总体情况</p>
                 <div className="clearfix">
                     <span className="hrSituation-span">总数(人)</span>
@@ -153,7 +123,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="企业职工"
                     >
                         {getFieldDecorator('firmTotal', {
-                            initialValue: this.state.firmTotal || null
+                            initialValue: this.props.data.firmTotal || null
                         })(
                             <InputNumber />
                             )}
@@ -163,7 +133,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="科技人员"
                     >
                         {getFieldDecorator('techTotal', {
-                            initialValue: this.state.techTotal || null
+                            initialValue: this.props.data.techTotal || null
                         })(
                             <InputNumber />
                             )}
@@ -184,7 +154,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="企业职工"
                     >
                         {getFieldDecorator('firmInService', {
-                            initialValue: this.state.firmInService || null
+                            initialValue: this.props.data.firmInService || null
                         })(
                             <InputNumber />
                             )}
@@ -194,7 +164,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="科技人员"
                     >
                         {getFieldDecorator('techInService', {
-                            initialValue: this.state.techInService || null
+                            initialValue: this.props.data.techInService || null
                         })(
                             <InputNumber />
                             )}
@@ -205,7 +175,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="企业职工"
                     >
                         {getFieldDecorator('firmPartTime', {
-                            initialValue: this.state.firmPartTime || null
+                            initialValue: this.props.data.firmPartTime || null
                         })(
                             <InputNumber />
                             )}
@@ -215,7 +185,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="科技人员"
                     >
                         {getFieldDecorator('techPartTime', {
-                            initialValue: this.state.techPartTime || null
+                            initialValue: this.props.data.techPartTime || null
                         })(
                             <InputNumber />
                             )}
@@ -226,7 +196,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="企业职工"
                     >
                         {getFieldDecorator('firmTemporary', {
-                            initialValue: this.state.firmTemporary || null
+                            initialValue: this.props.data.firmTemporary || null
                         })(
                             <InputNumber />
                             )}
@@ -236,7 +206,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="科技人员"
                     >
                         {getFieldDecorator('techTemporary', {
-                            initialValue: this.state.techTemporary || null
+                            initialValue: this.props.data.techTemporary || null
                         })(
                             <InputNumber />
                             )}
@@ -247,7 +217,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="企业职工"
                     >
                         {getFieldDecorator('firmForeign', {
-                            initialValue: this.state.firmForeign || null
+                            initialValue: this.props.data.firmForeign || null
                         })(
                             <InputNumber />
                             )}
@@ -257,7 +227,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="科技人员"
                     >
                         {getFieldDecorator('techForeign', {
-                            initialValue: this.state.techForeign || null
+                            initialValue: this.props.data.techForeign || null
                         })(
                             <InputNumber />
                             )}
@@ -268,7 +238,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="企业职工"
                     >
                         {getFieldDecorator('firmAbroad', {
-                            initialValue: this.state.firmAbroad || null
+                            initialValue: this.props.data.firmAbroad || null
                         })(
                             <InputNumber />
                             )}
@@ -278,7 +248,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="科技人员"
                     >
                         {getFieldDecorator('techAbroad', {
-                            initialValue: this.state.techAbroad || null
+                            initialValue: this.props.data.techAbroad || null
                         })(
                             <InputNumber />
                             )}
@@ -289,7 +259,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="企业职工"
                     >
                         {getFieldDecorator('firmCore', {
-                            initialValue: this.state.firmCore || null
+                            initialValue: this.props.data.firmCore || null
                         })(
                             <InputNumber />
                             )}
@@ -299,7 +269,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="科技人员"
                     >
                         {getFieldDecorator('techCore', {
-                            initialValue: this.state.techCore || null
+                            initialValue: this.props.data.techCore || null
                         })(
                             <InputNumber />
                             )}
@@ -313,7 +283,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="博士"
                     >
                         {getFieldDecorator('doctor', {
-                            initialValue: this.state.doctor || null
+                            initialValue: this.props.data.doctor || null
                         })(
                             <InputNumber />
                             )}
@@ -323,7 +293,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="硕士"
                     >
                         {getFieldDecorator('master', {
-                            initialValue: this.state.master || null
+                            initialValue: this.props.data.master || null
                         })(
                             <InputNumber />
                             )}
@@ -333,7 +303,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="本科"
                     >
                         {getFieldDecorator('undergraduate', {
-                            initialValue: this.state.undergraduate || null
+                            initialValue: this.props.data.undergraduate || null
                         })(
                             <InputNumber />
                             )}
@@ -343,7 +313,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="大专及以下"
                     >
                         {getFieldDecorator('college', {
-                            initialValue: this.state.college || null
+                            initialValue: this.props.data.college || null
                         })(
                             <InputNumber />
                             )}
@@ -356,7 +326,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="高级职称"
                     >
                         {getFieldDecorator('seniorTitle', {
-                            initialValue: this.state.seniorTitle || null
+                            initialValue: this.props.data.seniorTitle || null
                         })(
                             <InputNumber />
                             )}
@@ -366,7 +336,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="中级职称"
                     >
                         {getFieldDecorator('intermediateTitle', {
-                            initialValue: this.state.intermediateTitle || null
+                            initialValue: this.props.data.intermediateTitle || null
                         })(
                             <InputNumber />
                             )}
@@ -376,7 +346,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="初级职称"
                     >
                         {getFieldDecorator('juniorTitle', {
-                            initialValue: this.state.juniorTitle || null
+                            initialValue: this.props.data.juniorTitle || null
                         })(
                             <InputNumber />
                             )}
@@ -386,7 +356,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="高级技工"
                     >
                         {getFieldDecorator('seniorMechanic', {
-                            initialValue: this.state.seniorMechanic || null
+                            initialValue: this.props.data.seniorMechanic || null
                         })(
                             <InputNumber />
                             )}
@@ -399,7 +369,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="30及以下"
                     >
                         {getFieldDecorator('belowThirty', {
-                            initialValue: this.state.belowThirty || null
+                            initialValue: this.props.data.belowThirty || null
                         })(
                             <InputNumber />
                             )}
@@ -409,7 +379,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="31-34"
                     >
                         {getFieldDecorator('thirtyoneToThirtyfour', {
-                            initialValue: this.state.thirtyoneToThirtyfour || null
+                            initialValue: this.props.data.thirtyoneToThirtyfour || null
                         })(
                             <InputNumber />
                             )}
@@ -419,7 +389,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="41-50"
                     >
                         {getFieldDecorator('fortyoneToFifty', {
-                            initialValue: this.state.fortyoneToFifty || null
+                            initialValue: this.props.data.fortyoneToFifty || null
                         })(
                             <InputNumber />
                             )}
@@ -429,7 +399,7 @@ const PersonFrom = Form.create()(React.createClass({
                         label="50以上"
                     >
                         {getFieldDecorator('aboveFifty', {
-                            initialValue: this.state.aboveFifty || null
+                            initialValue: this.props.data.aboveFifty || null
                         })(
                             <InputNumber />
                             )}
@@ -491,45 +461,265 @@ const PersonFrom = Form.create()(React.createClass({
     },
 }));
 
-const Person = React.createClass({
+const HrSituationDesc = React.createClass({
     getInitialState() {
         return {
+            visible: false,
             loading: false
         };
     },
+    componentWillReceiveProps(nextProps) {
+        this.state.visible = nextProps.showDesc
+    },
+    showModal() {
+        this.setState({
+            visible: true,
+        });
+    },
+    handleOk() {
+        this.setState({
+            visible: false,
+        });
+        this.props.closeDesc(false);
+    },
+    handleCancel(e) {
+        this.setState({
+            visible: false,
+        });
+        this.props.closeDesc(false);
+    },
     spinChange(e) {
         this.setState({
             loading: e
         });
     },
     render() {
-        const theYear = (new Date()).getFullYear() - 1;
-        if (this.props.data) {
-            return (
+        return (
+            <div className="patent-addNew">
                 <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>
+                    <Modal title="人力资源状况" visible={this.state.visible}
+                        onOk={this.handleOk} onCancel={this.handleCancel}
+                        width='1200px'
+                        footer=''
+                    >
+                        <HrSituationDescFrom data={this.props.data}
+                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                    </Modal>
                 </Spin>
-            )
-        } else {
-            return (
-                <div></div>
-            )
+            </div>
+        );
+    },
+});
+
+const HrSituation = React.createClass({
+    loadData(pageNo) {
+        this.state.data = [];
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/orgHumanResource",
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                uid: this.props.data.uid
+            }
+        }).done((data) => {
+            if (data.error.length || !data.data || !data.data.list) {
+                message.warning(data.error[0].message);
+                return;
+            };
+            for (let i = 0; i < data.data.list.length; i++) {
+                let thisdata = data.data.list[i];
+                this.state.data.push({
+                    key: i,
+                    id: thisdata.id,
+                    uid: thisdata.uid,
+                    year: thisdata.year,
+                    aboveFifty: thisdata.aboveFifty,
+                    belowThirty: thisdata.belowThirty,
+                    college: thisdata.college,
+                    doctor: thisdata.doctor,
+                    firmAbroad: thisdata.firmAbroad,
+                    firmCore: thisdata.firmCore,
+                    firmForeign: thisdata.firmForeign,
+                    firmInService: thisdata.firmInService,
+                    firmPartTime: thisdata.firmPartTime,
+                    firmTemporary: thisdata.firmTemporary,
+                    firmTotal: thisdata.firmTotal,
+                    fortyoneToFifty: thisdata.fortyoneToFifty,
+                    intermediateTitle: thisdata.intermediateTitle,
+                    juniorTitle: thisdata.juniorTitle,
+                    master: thisdata.master,
+                    seniorMechanic: thisdata.seniorMechanic,
+                    seniorTitle: thisdata.seniorTitle,
+                    techAbroad: thisdata.techAbroad,
+                    techCore: thisdata.techCore,
+                    techForeign: thisdata.techForeign,
+                    techInService: thisdata.techInService,
+                    techPartTime: thisdata.techPartTime,
+                    techTemporary: thisdata.techTemporary,
+                    techTotal: thisdata.techTotal,
+                    thirtyoneToThirtyfour: thisdata.thirtyoneToThirtyfour,
+                    undergraduate: thisdata.undergraduate,
+                    attachment: [thisdata.rosterDownloadFileName, thisdata.socialSecurityDownloadFileName]
+                });
+            };
+            this.state.pagination.current = data.data.pageNo;
+            this.state.pagination.total = data.data.totalCount;
+            this.setState({
+                dataSource: this.state.data,
+                pagination: this.state.pagination
+            });
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    getInitialState() {
+        return {
+            selectedRowKeys: [],
+            selectedRows: [],
+            loading: false,
+            pagination: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.loadData(page);
+                }.bind(this),
+                showTotal: function (total) {
+                    return '共' + total + '条数据';
+                }
+            },
+            columns: [
+                {
+                    title: '年份',
+                    dataIndex: 'year',
+                    key: 'year'
+                }, {
+                    title: '总人数',
+                    dataIndex: 'firmTotal',
+                    key: 'firmTotal'
+                }, {
+                    title: '科技人员',
+                    dataIndex: 'techTotal',
+                    key: 'techTotal'
+                }, {
+                    title: '博士人数',
+                    dataIndex: 'doctor',
+                    key: 'doctor',
+                }, {
+                    title: '高级职称人数',
+                    dataIndex: 'seniorTitle',
+                    key: 'seniorTitle',
+                }, {
+                    title: '30岁以下人数',
+                    dataIndex: 'belowThirty',
+                    key: 'belowThirty',
+                }, {
+                    title: '相关附件',
+                    dataIndex: 'attachment',
+                    key: 'attachment',
+                    render: (text) => {
+                        <a href="" onClick={() => {
+                            window.open(globalConfig.context + "/techservice/patent/downloadFile?path=" + text + "&sign=" + "type")
+                        }}></a>
+                    }
+                }
+            ],
+            dataSource: []
+        };
+    },
+    componentWillMount() {
+        this.loadData();
+    },
+    tableRowClick(record, index) {
+        this.state.RowData = record;
+        this.setState({
+            showDesc: true
+        });
+    },
+    delectRow() {
+        let deletedIds = [];
+        for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
+            let rowItem = this.state.selectedRows[idx];
+            if (rowItem.id) {
+                deletedIds.push(rowItem.id)
+            }
         }
+        this.setState({
+            selectedRowKeys: [],
+            loading: deletedIds.length > 0
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/techservice/cognizance/deleteFinance",
+            data: {
+                ids: deletedIds
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('保存成功!');
+                this.setState({
+                    loading: false,
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
+    closeDesc(e) {
+        this.state.showDesc = e;
+        this.loadData();
+    },
+    render() {
+        const rowSelection = {
+            selectedRowKeys: this.state.selectedRowKeys,
+            onChange: (selectedRowKeys, selectedRows) => {
+                this.setState({
+                    selectedRows: selectedRows,
+                    selectedRowKeys: selectedRowKeys
+                });
+            }
+        };
+        const hasSelected = this.state.selectedRowKeys.length > 0;
+        return (
+            <div className="user-content" >
+                <div className="content-title">
+                    <span>人力资源状况</span>
+                </div>
+                <div className="user-search">
+                    <p>
+                        <Button style={{ background: "#ea0862", border: "none", color: "#fff" }}
+                            onClick={this.tableRowClick}>添加<Icon type="plus" /></Button>
+                        <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
+                            disabled={!hasSelected}
+                            onClick={this.delectRow}>删除<Icon type="minus" /></Button>
+                    </p>
+                </div>
+                <div className="patent-table">
+                    <Spin spinning={this.state.loading}>
+                        <Table columns={this.state.columns}
+                            dataSource={this.state.dataSource}
+                            pagination={this.state.pagination}
+                            rowSelection={rowSelection}
+                            onRowClick={this.tableRowClick} />
+                    </Spin>
+                </div>
+                <HrSituationDesc data={this.state.RowData}
+                    showDesc={this.state.showDesc} closeDesc={this.closeDesc} />
+            </div >
+        );
     }
 });
 
-export default Person;
+export default HrSituation;

js/component/manageCenter/servicesManage/highTech/fosterDesc/ablt.jsx → js/component/manageCenter/servicesManage/highTech/fosterDesc/innovationAbility.jsx


+ 13 - 7
js/component/manageCenter/servicesManage/highTech/fosterDesc/ratepay.jsx

@@ -31,9 +31,10 @@ const RatepayDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/disposeRatepay",
+                    url: globalConfig.context + "/api/admin/disposeRatepay",
                     data: {
                         id: this.props.data.id,
+                        uid: this.props.uid,
                         operatingIncome: values.operatingIncome,
                         managementCost: values.managementCost,
                         operatingProfit: values.operatingProfit,
@@ -228,7 +229,9 @@ const RatepayDesc = React.createClass({
                         width='800px'
                         footer=''
                     >
-                        <RatepayDescFrom data={this.props.data}
+                        <RatepayDescFrom
+                            uid={this.props.uid}
+                            data={this.props.data}
                             spinState={this.spinChange} closeModal={this.handleCancel} />
                     </Modal>
                 </Spin>
@@ -244,13 +247,14 @@ const Ratepay = React.createClass({
             loading: true
         });
         $.ajax({
-            method: "get",
+            method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/ratepay",
+            url: globalConfig.context + "/api/admin/ratepay",
             data: {
                 pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize
+                pageSize: this.state.pagination.pageSize,
+                uid: this.props.data.uid
             }
         }).done((data) => {
             if (data.error.length || !data.data || !data.data.list) {
@@ -329,7 +333,7 @@ const Ratepay = React.createClass({
                     dataIndex: 'taxReturnUrl',
                     key: 'taxReturnUrl',
                     render: (text) => {
-                        <a href="" onClick={()=>{
+                        <a href="" onClick={() => {
                             window.open(globalConfig.context + "/techservice/patent/downloadFile?path=" + text + "&sign=" + "type")
                         }}></a>
                     }
@@ -423,7 +427,9 @@ const Ratepay = React.createClass({
                             onRowClick={this.tableRowClick} />
                     </Spin>
                 </div>
-                <RatepayDesc data={this.state.RowData}
+                <RatepayDesc
+                    uid={this.props.data.uid}
+                    data={this.state.RowData}
                     showDesc={this.state.showDesc} closeDesc={this.closeDesc} />
             </div >
         );

+ 23 - 11
js/component/manageCenter/servicesManage/highTech/fosterDesc/techProduct.jsx

@@ -23,12 +23,16 @@ const TechProductDescFrom = Form.create()(React.createClass({
                 <Select.Option value={item.value} key={10000 + item.value}>{item.key}</Select.Option>
             )
         });
-        this.state.targetKeys = this.props.data.intellectualPropertyNumber;
+        this.state.targetKeys = this.props.data.intellectualPropertyNumber || [];
     },
     componentWillReceiveProps(nextProps) {
-        if (nextProps.data) {
+        if (nextProps.data.intellectualPropertyNumber) {
             this.state.targetKeys = nextProps.data.intellectualPropertyNumber;
         };
+        // if ( !nextProps.data.id) {
+        //     this.state.targetKeys = [];
+        //     this.props.form.resetFields();
+        // }
     },
     handleSubmit(e) {
         e.preventDefault();
@@ -39,9 +43,10 @@ const TechProductDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/techProduct",
+                    url: globalConfig.context + "/api/admin/techProduct",
                     data: {
                         id: this.props.data.id,
+                        uid: this.props.uid,
                         serialNumber: values.serialNumber,
                         productName: values.productName,
                         technicalField1: values.techField[0],
@@ -50,7 +55,7 @@ const TechProductDescFrom = Form.create()(React.createClass({
                         technicalSource: values.technicalSource,
                         lastYearRevenue: values.lastYearRevenue,
                         mainProduct: values.mainProduct,
-                        intellectualPropertyNumber: this.state.targetKeys.join(","),
+                        intellectualPropertyNumber: this.state.targetKeys ? this.state.targetKeys.join(",") : '',
                         keyTechnology: values.keyTechnology,
                         competitiveEdge: values.competitiveEdge,
                         conditionEffect: values.conditionEffect
@@ -295,7 +300,10 @@ const TechProductDesc = React.createClass({
                         width='800px'
                         footer=''
                     >
-                        <TechProductDescFrom data={this.props.data} mockData={this.props.mockData}
+                        <TechProductDescFrom
+                            data={this.props.data}
+                            uid={this.props.uid}
+                            mockData={this.props.mockData}
                             spinState={this.spinChange} closeModal={this.handleCancel} />
                     </Modal>
                 </Spin>
@@ -311,22 +319,24 @@ const TechProduct = React.createClass({
             loading: true
         });
         $.when($.ajax({
-            method: "get",
+            method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/techProductList",
+            url: globalConfig.context + "/api/admin/techProductList",
             data: {
                 pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize
+                pageSize: this.state.pagination.pageSize,
+                uid: this.props.data.uid
             }
         }), $.ajax({
-            method: "get",
+            method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/intellectualList",
+            url: globalConfig.context + "/api/admin/intellectualList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: 99,
+                uid: this.props.data.uid
             }
         })).done((data1, data2) => {
             let data = data1[0];
@@ -529,7 +539,9 @@ const TechProduct = React.createClass({
                             onRowClick={this.tableRowClick} />
                     </Spin>
                 </div>
-                <TechProductDesc data={this.state.RowData}
+                <TechProductDesc
+                    data={this.state.RowData}
+                    uid={this.props.data.uid}
                     mockData={this.state.mockData}
                     showDesc={this.state.showDesc} closeDesc={this.closeDesc} />
             </div >

+ 23 - 15
js/component/manageCenter/userManage/content.jsx

@@ -1,36 +1,44 @@
 import React, { Component } from 'react';
 import '../content.less';
-import LeftTab from './leftTab.jsx';
-import UserList from './userList.jsx';
-import OrgList from './orgList.jsx';
+import LeftTab from './leftTab';
+import UserList from './userList';
+
 
 class Content extends Component {
     constructor() {
         super();
         this.state = {
             loading: false,
-            leftKey: 'userList',
+            component: <UserList />,
         };
     }
 
     getKey(key) {
-        this.setState({
-            leftKey: key,
-        });
+        switch (key) {
+            case 'userList':
+                require.ensure([], () => {
+                    const UserList = require('./userList');
+                    this.setState({
+                        component: <UserList />,
+                    });
+                });
+                break;
+            case 'orgList':
+                require.ensure([], () => {
+                    const OrgList = require('./orgList');
+                    this.setState({
+                        component: <OrgList />,
+                    });
+                });s
+                break;
+        }
     }
     render() {
         return (
             <div className="manage-content">
                 <LeftTab handlekey={this.getKey.bind(this)} />
                 <div className="content-right">
-                    {(() => {
-                        switch (this.state.leftKey) {
-                            case 'userList':
-                                return <UserList />;
-                            case 'orgList':
-                                return <OrgList />;
-                        };
-                    })()}
+                    {this.state.component}
                 </div>
             </div>
         )

+ 20 - 19
js/component/manageCenter/userManage/orgList.jsx

@@ -7,7 +7,7 @@ import './userList.less';
 import OrgDesc from './orgDesc.jsx';
 import { auditStatusList } from '../../dataDic.js';
 
-const UserList = React.createClass({
+export default class OrgList extends React.Component {
     loadData(pageNo) {
         this.state.data = [];
         this.setState({
@@ -43,7 +43,7 @@ const UserList = React.createClass({
                         createTime: thisdata.createTime,
                         aftUsername: thisdata.aftUsername,
                         number: thisdata.number,
-                        auditStatus:thisdata.auditStatus,
+                        auditStatus: thisdata.auditStatus,
                         createTimeFormattedDate: thisdata.createTimeFormattedDate
                     });
                 };
@@ -59,13 +59,14 @@ const UserList = React.createClass({
                 loading: false
             });
         }.bind(this));
-    },
-    getInitialState() {
-        return {
+    }
+    constructor() {
+        super();
+        this.state = {
             searchMore: true,
             data: [],
             loading: false,
-            searchTime:[,],
+            searchTime: [,],
             pagination: {
                 defaultCurrent: 1,
                 defaultPageSize: 10,
@@ -127,23 +128,23 @@ const UserList = React.createClass({
             ],
             dataSource: []
         };
-    },
+    }
     componentWillMount() {
         this.loadData();
-    },
+    }
     tableRowClick(record, index) {
         this.state.RowData = record;
         this.setState({
             showDesc: true
         });
-    },
+    }
     closeDesc(e) {
         this.state.showDesc = e;
         this.loadData();
-    },
+    }
     search() {
         this.loadData();
-    },
+    }
     reset() {
         this.state.searchAftId = "";
         this.state.searchLoginId = "";
@@ -152,15 +153,15 @@ const UserList = React.createClass({
         this.state.searchEmail = "";
         this.state.searchTime = [,];
         this.loadData();
-    },
+    }
     searchSwitch() {
         this.setState({
             searchMore: !this.state.searchMore
         });
-    },
+    }
     searchcreateTime(date, dateString) {
         this.state.createTime = dateString;
-    },
+    }
     render() {
         const { RangePicker } = DatePicker;
         return (
@@ -185,15 +186,15 @@ const UserList = React.createClass({
                     <Input placeholder="认证名称" value={this.state.searchAftUsername}
                         onChange={(e) => { this.setState({ searchAftUsername: e.target.value }); }} />
                     <Input placeholder="联系方式" value={this.state.searchEmail}
-                        onChange={(e) => { this.setState({ searchEmail : e.target.value }); }} />
+                        onChange={(e) => { this.setState({ searchEmail: e.target.value }); }} />
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                         <p>
                             <span>注册时间:</span>
-                            <RangePicker value={[moment(this.state.searchTime[0]),moment(this.state.searchTime[1])]}
-                                onChange={(data, dataString) => { this.setState({searchTime : dataString}); }} />
+                            <RangePicker value={[moment(this.state.searchTime[0]), moment(this.state.searchTime[1])]}
+                                onChange={(data, dataString) => { this.setState({ searchTime: dataString }); }} />
                         </p>
                     </div>
                 </div>
@@ -209,6 +210,6 @@ const UserList = React.createClass({
             </div >
         );
     }
-});
+};
 
-export default UserList;
+module.exports = OrgList;

+ 2 - 2
package.json

@@ -8,8 +8,8 @@
     "build": "webpack --progress --colors --env.deploy dev",
     "buildtest": "webpack --progress --colors --env.deploy test",
     "buildstage": "webpack --progress --colors --env.deploy stage",
-    "pro": "webpack --config webpack.config.pro.js --progress --colors --env.deploy prod",
-    "dev": "webpack-dev-server --port 8000 --devtool eval --progress --colors --hot --content-base build --env.deploy watch"
+    "pro": "webpack --progress --colors --env.deploy prod",
+    "dev": "webpack-dev-server --port 80 --devtool eval --progress --colors --hot --content-base build --env.deploy watch"
   },
   "repository": {
     "type": "git",

+ 2 - 3
webpack.config.js

@@ -23,8 +23,7 @@ module.exports = (function () {
         }),
         //把入口文件里面的数组打包成verdors.js
         new webpack.optimize.CommonsChunkPlugin({
-            name: 'vendors',
-            chunks: ['vendors']
+            name: 'vendors'
         }),
         //user
         new HtmlWebpackPlugin({
@@ -146,7 +145,7 @@ module.exports = (function () {
     return {
         entry: isWatch ? entries.watch : entries.prod,
         output: {
-            path: path.resolve(__dirname, './build/' + version),
+            path: path.resolve(__dirname, './build/' + argv.env.deploy + '/' + version),
             filename: '[name].js',
             publicPath: staticHost,
             chunkFilename: 'chunks/[name].[hash:8].js'