From 4dcbd5148266d614490c4922d830a4da8f24a4dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com> Date: Tue, 15 Jun 2021 15:56:44 +0800 Subject: [PATCH 01/84] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=9B=E5=AE=A2?= =?UTF-8?q?=E7=A9=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 162 ++++++++---- package.json | 1 + src/App.js | 8 + src/military/components/DelModal.jsx | 20 ++ src/military/components/Upload.jsx | 97 +++++++ src/military/components/chooseNav/index.jsx | 29 ++ src/military/components/chooseNav/index.scss | 42 +++ .../components/itemListTask/index.jsx | 21 ++ .../components/itemListTask/index.scss | 70 +++++ src/military/components/sortBox/index.jsx | 48 ++++ src/military/components/sortBox/index.scss | 40 +++ src/military/fetch.js | 112 ++++++++ src/military/index.scss | 87 ++++++ src/military/task.js | 67 +++++ src/military/task/api.js | 70 +++++ src/military/task/static.js | 19 ++ src/military/task/taskDetail/index.jsx | 63 +++++ src/military/task/taskDetail/index.scss | 37 +++ src/military/task/taskEdit/index.jsx | 247 ++++++++++++++++++ src/military/task/taskEdit/index.scss | 4 + src/military/task/taskList/index.jsx | 157 +++++++++++ src/military/task/taskList/index.scss | 5 + 22 files changed, 1348 insertions(+), 58 deletions(-) create mode 100644 src/military/components/DelModal.jsx create mode 100644 src/military/components/Upload.jsx create mode 100644 src/military/components/chooseNav/index.jsx create mode 100644 src/military/components/chooseNav/index.scss create mode 100644 src/military/components/itemListTask/index.jsx create mode 100644 src/military/components/itemListTask/index.scss create mode 100644 src/military/components/sortBox/index.jsx create mode 100644 src/military/components/sortBox/index.scss create mode 100644 src/military/fetch.js create mode 100644 src/military/index.scss create mode 100644 src/military/task.js create mode 100644 src/military/task/api.js create mode 100644 src/military/task/static.js create mode 100644 src/military/task/taskDetail/index.jsx create mode 100644 src/military/task/taskDetail/index.scss create mode 100644 src/military/task/taskEdit/index.jsx create mode 100644 src/military/task/taskEdit/index.scss create mode 100644 src/military/task/taskList/index.jsx create mode 100644 src/military/task/taskList/index.scss diff --git a/package-lock.json b/package-lock.json index f5aabc0e..e143c4b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "educoder", + "name": "forge", "version": "0.1.0", "lockfileVersion": 1, "requires": true, @@ -252,6 +252,22 @@ } } }, + "@babel/runtime-corejs3": { + "version": "7.14.6", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.6.tgz", + "integrity": "sha512-Xl8SPYtdjcMoCsIM4teyVRg7jIcgl8F2kRtoCcXuHzXswt9UxZCS6BzRo8fcnCuP6u2XtPgvyonmEPF57Kxo9Q==", + "requires": { + "core-js-pure": "^3.14.0", + "regenerator-runtime": "^0.13.4" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.7", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==" + } + } + }, "@babel/template": { "version": "7.8.6", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", @@ -1256,7 +1272,7 @@ }, "babel-cli": { "version": "6.26.0", - "resolved": "https://registry.npm.taobao.org/babel-cli/download/babel-cli-6.26.0.tgz", + "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz", "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=", "dev": true, "requires": { @@ -1279,7 +1295,7 @@ "dependencies": { "chokidar": { "version": "1.7.0", - "resolved": "https://registry.npm.taobao.org/chokidar/download/chokidar-1.7.0.tgz?cache=0&sync_timestamp=1602585438968&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-1.7.0.tgz", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "dev": true, "optional": true, @@ -1297,7 +1313,7 @@ }, "source-map": { "version": "0.5.7", - "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true } @@ -1396,7 +1412,7 @@ }, "babel-helper-bindify-decorators": { "version": "6.24.1", - "resolved": "https://registry.npm.taobao.org/babel-helper-bindify-decorators/download/babel-helper-bindify-decorators-6.24.1.tgz", + "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz", "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=", "dev": true, "requires": { @@ -1459,7 +1475,7 @@ }, "babel-helper-explode-class": { "version": "6.24.1", - "resolved": "https://registry.npm.taobao.org/babel-helper-explode-class/download/babel-helper-explode-class-6.24.1.tgz", + "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz", "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=", "dev": true, "requires": { @@ -1659,7 +1675,7 @@ }, "babel-plugin-syntax-async-generators": { "version": "6.13.0", - "resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-async-generators/download/babel-plugin-syntax-async-generators-6.13.0.tgz", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz", "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=", "dev": true }, @@ -1670,7 +1686,7 @@ }, "babel-plugin-syntax-decorators": { "version": "6.13.0", - "resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-decorators/download/babel-plugin-syntax-decorators-6.13.0.tgz", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz", "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=", "dev": true }, @@ -1706,7 +1722,7 @@ }, "babel-plugin-transform-async-generator-functions": { "version": "6.24.1", - "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-async-generator-functions/download/babel-plugin-transform-async-generator-functions-6.24.1.tgz", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz", "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=", "dev": true, "requires": { @@ -1738,7 +1754,7 @@ }, "babel-plugin-transform-decorators": { "version": "6.24.1", - "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-decorators/download/babel-plugin-transform-decorators-6.24.1.tgz", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz", "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=", "dev": true, "requires": { @@ -2043,7 +2059,7 @@ }, "babel-plugin-transform-runtime": { "version": "6.23.0", - "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-runtime/download/babel-plugin-transform-runtime-6.23.0.tgz", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz", "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", "requires": { "babel-runtime": "^6.22.0" @@ -2060,7 +2076,7 @@ }, "babel-polyfill": { "version": "6.26.0", - "resolved": "https://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.26.0.tgz", + "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz", "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=", "dev": true, "requires": { @@ -2071,7 +2087,7 @@ "dependencies": { "regenerator-runtime": { "version": "0.10.5", - "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.10.5.tgz?cache=0&sync_timestamp=1595456367497&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.10.5.tgz", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz", "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=", "dev": true } @@ -2116,7 +2132,7 @@ }, "babel-preset-es2015": { "version": "6.24.1", - "resolved": "https://registry.npm.taobao.org/babel-preset-es2015/download/babel-preset-es2015-6.24.1.tgz", + "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz", "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=", "dev": true, "requires": { @@ -2164,7 +2180,7 @@ }, "babel-preset-react": { "version": "6.24.1", - "resolved": "https://registry.npm.taobao.org/babel-preset-react/download/babel-preset-react-6.24.1.tgz", + "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz", "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=", "requires": { "babel-plugin-syntax-jsx": "^6.3.13", @@ -2197,7 +2213,7 @@ }, "babel-preset-stage-2": { "version": "6.24.1", - "resolved": "https://registry.npm.taobao.org/babel-preset-stage-2/download/babel-preset-stage-2-6.24.1.tgz", + "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz", "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=", "dev": true, "requires": { @@ -2209,7 +2225,7 @@ }, "babel-preset-stage-3": { "version": "6.24.1", - "resolved": "https://registry.npm.taobao.org/babel-preset-stage-3/download/babel-preset-stage-3-6.24.1.tgz", + "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz", "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=", "dev": true, "requires": { @@ -3486,7 +3502,7 @@ }, "code-prettify": { "version": "0.1.0", - "resolved": "https://registry.npm.taobao.org/code-prettify/download/code-prettify-0.1.0.tgz", + "resolved": "https://registry.npmjs.org/code-prettify/-/code-prettify-0.1.0.tgz", "integrity": "sha1-RocMyMGlDQm61TmzOpg9vUqjSx4=" }, "codemirror": { @@ -3771,6 +3787,11 @@ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" }, + "core-js-pure": { + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz", + "integrity": "sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==" + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -3888,11 +3909,6 @@ "randomfill": "^1.0.3" } }, - "crypto-js": { - "version": "4.0.0", - "resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz", - "integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw=" - }, "crypto-random-string": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", @@ -7125,8 +7141,7 @@ "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "optional": true + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "aproba": { "version": "1.2.0", @@ -7147,14 +7162,12 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "optional": true + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7169,20 +7182,17 @@ "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "optional": true + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "optional": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "optional": true + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "core-util-is": { "version": "1.0.2", @@ -7299,8 +7309,7 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "optional": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ini": { "version": "1.3.5", @@ -7312,7 +7321,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7327,7 +7335,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7335,14 +7342,12 @@ "minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "optional": true + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "minipass": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7361,7 +7366,6 @@ "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", - "optional": true, "requires": { "minimist": "^1.2.5" } @@ -7423,8 +7427,7 @@ "npm-normalize-package-bin": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", - "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", - "optional": true + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==" }, "npm-packlist": { "version": "1.4.8", @@ -7452,8 +7455,7 @@ "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "optional": true + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "object-assign": { "version": "4.1.1", @@ -7465,7 +7467,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "optional": true, "requires": { "wrappy": "1" } @@ -7543,8 +7544,7 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "optional": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safer-buffer": { "version": "2.1.2", @@ -7580,7 +7580,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7600,7 +7599,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7644,14 +7642,12 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "optional": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "optional": true + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" } } }, @@ -11541,7 +11537,7 @@ }, "output-file-sync": { "version": "1.1.2", - "resolved": "https://registry.npm.taobao.org/output-file-sync/download/output-file-sync-1.1.2.tgz", + "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz", "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=", "dev": true, "requires": { @@ -18879,7 +18875,7 @@ }, "user-home": { "version": "1.1.1", - "resolved": "https://registry.npm.taobao.org/user-home/download/user-home-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=", "dev": true }, @@ -18936,7 +18932,7 @@ }, "v8flags": { "version": "2.1.1", - "resolved": "https://registry.npm.taobao.org/v8flags/download/v8flags-2.1.1.tgz?cache=0&sync_timestamp=1590964281452&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fv8flags%2Fdownload%2Fv8flags-2.1.1.tgz", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", "dev": true, "requires": { @@ -19025,6 +19021,56 @@ "makeerror": "1.0.x" } }, + "wangeditor": { + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/wangeditor/-/wangeditor-4.7.3.tgz", + "integrity": "sha512-O6mbZkpGPksGWHYl7dKtYFbdfULn5oS7DYF9RS1WpG9rBumqa5CtLaxryc6P0i4IYb/fKRE55hD2XpkPzILpjg==", + "requires": { + "@babel/runtime": "^7.11.2", + "@babel/runtime-corejs3": "^7.11.2", + "tslib": "^2.1.0" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.14.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz", + "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "regenerator-runtime": { + "version": "0.13.7", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==" + }, + "tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + } + } + }, + "wangeditor-for-react": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/wangeditor-for-react/-/wangeditor-for-react-1.4.0.tgz", + "integrity": "sha512-N0WaZvhdbj/tsT6FZTm65S9o3EECxNTcMn4val+00lPi7GhUCMwdWh1buBCvp3nbmM0pHo7hWxdcK/U9KkmUug==", + "requires": { + "react": "^17.0.2", + "wangeditor": "^4.7.0" + }, + "dependencies": { + "react": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz", + "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==", + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } + } + } + }, "warning": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", diff --git a/package.json b/package.json index edc6e18e..1476879f 100644 --- a/package.json +++ b/package.json @@ -107,6 +107,7 @@ "styled-components": "^4.4.1", "sw-precache-webpack-plugin": "0.11.4", "url-loader": "0.6.2", + "wangeditor-for-react": "^1.4.0", "webpack-cli": "^3.3.11", "webpack-dev-server": "^3.10.3", "webpack-manifest-plugin": "^2.2.0", diff --git a/src/App.js b/src/App.js index 789c0af2..588e5b8f 100644 --- a/src/App.js +++ b/src/App.js @@ -45,6 +45,11 @@ const OpsDetail = Loadable({ loader: () => import('./forge/DevOps/opsDetail'), loading: Loading, }) +//任务/需求 +const Task = Loadable({ + loader: () => import('./military/task'), + loading: Loading, +}) //403页面 const Shixunauthority = Loadable({ loader: () => import('./modules/403/Shixunauthority'), @@ -240,6 +245,9 @@ class App extends Component { } } /> + {/*任务*/} + + {/*403*/} diff --git a/src/military/components/DelModal.jsx b/src/military/components/DelModal.jsx new file mode 100644 index 00000000..b2ba4434 --- /dev/null +++ b/src/military/components/DelModal.jsx @@ -0,0 +1,20 @@ +import { Modal } from 'antd'; + +export default ( + handleOk, + title, + content, + handleCancel) => { + return Modal.confirm({ + title: title || "警告", + content: content || "确认删除？", + okText: '确定', + cancelText: '取消', + onOk() { + handleOk && handleOk(); + }, + onCancel() { + handleCancel && handleCancel(); + } + }); +} \ No newline at end of file diff --git a/src/military/components/Upload.jsx b/src/military/components/Upload.jsx new file mode 100644 index 00000000..1bcf218d --- /dev/null +++ b/src/military/components/Upload.jsx @@ -0,0 +1,97 @@ +import React, { useEffect, useState } from "react"; +import { Upload, Button } from 'antd'; +import axios from 'axios'; +import { appendFileSizeToUploadFileAll } from 'educoder'; +axios.defaults.withCredentials = true; + +function Uploads({ className, size, actionUrl, fileList, showNotification, load }) { + const [files, setFiles] = useState(undefined); + + useEffect(() => { + if (fileList) { + init(); + } + }, [fileList]); + + function init() { + let f = appendFileSizeToUploadFileAll(fileList); + setFiles(f); + } + function onAttachmentRemove(file) { + if (!file.percent || file.percent === 100) { + deleteAttachment(file); + return false; + } + } + function deleteAttachment(file) { + let id = (file.response && file.response.data && file.response.data.id) || file.id; + + // 暂时不直接删除上传的文件，只在最后保存的时候进行修改 + let nf = files.filter(item => { + let itemId = (item.response && item.response.data && item.response.data.id) || item.id; + return itemId !== id; + }); + setFiles(nf); + // fileIdList(nf); + load && load(nf); + + // 发送服务到后台删除文件，同步更新数据 + // const url = actionUrl + `/busiAttachments/${id}`; + // axios.delete(url).then((response) => { + // if (response.data) { + // if (response.data.code === "1") { + // let nf = files.filter(item => (item.response.data.id !== id) && (item.id !== id)); + // setFiles(nf); + // fileIdList(nf); + // } else { + // showNotification(response.data.message); + // } + // } + // }).catch(function (error) { + // console.log(error); + // }); + } + + + function handleChange(info) { + if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') { + let fileList = info.fileList; + setFiles(appendFileSizeToUploadFileAll(fileList)); + if (info.file.status === 'done' || info.file.status === 'removed') load && load(fileList); + } + } + + // function fileIdList(fileList) { + // let id = []; + // let fileType = []; + // for (const item of fileList) { + // id.push(item.id || item.response.data.id); + // fileType.push(item.fileType || item.response.data.fileType); + // } + // load && load(id.join(), fileType.join()); + // } + + function beforeUpload(file) { + const isLt100M = file.size / 1024 / 1024 < size; + if (!isLt100M) { + showNotification(`文件大小必须小于${size}MB!`); + } + return isLt100M; + } + + const upload = { + name: 'file', + fileList: files, + action: actionUrl + `/busiAttachments/upload`, + onChange: handleChange, + onRemove: onAttachmentRemove, + beforeUpload: beforeUpload, + }; + return ( + + + (你可以上传小于{size}MB的文件) + + ) +} +export default Uploads; \ No newline at end of file diff --git a/src/military/components/chooseNav/index.jsx b/src/military/components/chooseNav/index.jsx new file mode 100644 index 00000000..3f1216c4 --- /dev/null +++ b/src/military/components/chooseNav/index.jsx @@ -0,0 +1,29 @@ +import React, { useEffect, useState } from 'react'; +import classNames from 'classnames'; +import './index.scss'; + +export default (props) => { + const { title, options, changeOptionId, type } = props; + + const [option, setOption] = useState({ code: "", dicItemName: "" ,dicItemCode:""}); + + useEffect(() => { + changeOptionId(option, type); + }, [option]) + + return ( + +
+
{title}
+
+
{ setOption({ code: "", dicItemName: "" }) }}>全部
+ { + options.map((item) => { + return
{ setOption(item) }} >{item.dicItemName}
+ }) + } +
+
+ + ) +} \ No newline at end of file diff --git a/src/military/components/chooseNav/index.scss b/src/military/components/chooseNav/index.scss new file mode 100644 index 00000000..42ac7b01 --- /dev/null +++ b/src/military/components/chooseNav/index.scss @@ -0,0 +1,42 @@ +.nav-content { + margin:20px 0; + background: #fff; + border-bottom: 1px solid #eaeaea; + box-shadow: #ddd 0px 0px 5px; +} +.shop-box { + width: 1280px; + border-top: 1px solid #eaeaea; + display: flex; + justify-content: start; +} +.choose-title { + width: 110px; + background: #f3f3f3; + text-align: center; + padding: 16px 0; + font-size: 14px; + color: #666; + font-weight: 600; +} +.choose-list { + width: 1170px; + padding: 16px 0; + display: flex; + justify-content: start; +} +.choose-item { + font-size: 14px; + color:#666; + text-align: center; + padding: 0 15px ; + cursor: pointer; + &:hover{ + color: #0072ff; + } +} + +.choose-item-checked { + color: #0072ff; +} + diff --git a/src/military/components/itemListTask/index.jsx b/src/military/components/itemListTask/index.jsx new file mode 100644 index 00000000..dae5511c --- /dev/null +++ b/src/military/components/itemListTask/index.jsx @@ -0,0 +1,21 @@ +import React from 'react'; +import './index.scss'; +export default (props) => { + const { list, itemClick, } = props; + + return ( + list.map(item => { + return ( +
+
{ itemClick(item.id) }}> + {item.achievementName || item.title} +
+
+ {item.publisher &&

发布单位：{item.publisher}

} +

发布时间：{item.publishDate || item.createTime}

+
+
+ ) + }) + ) +} \ No newline at end of file diff --git a/src/military/components/itemListTask/index.scss b/src/military/components/itemListTask/index.scss new file mode 100644 index 00000000..c4739395 --- /dev/null +++ b/src/military/components/itemListTask/index.scss @@ -0,0 +1,70 @@ +.list-box { + position: relative; + padding: 20px; + background: #fff; + border-bottom: 1px solid #dedede; +} +.list-title { + font-size: 17px; + color: #000; + cursor: pointer; +} +.list-title:hover { + color: #409eff; +} +.list-title span { + padding: 3px 5px; + margin-left:.5em; + background: #f8c753; + font-size: 13px; + color: #fff; + border-radius: 3px; +} +span.list-done { + background: #35d77e; +} +span.list-error { + background: #f56c6c; +} + +.list-tag { + display: inline-block; + margin: 5px 10px 5px 0; + background: #cfe9ff; + color: #0089ff; + font-size: 14px; + border-radius: 3px; + padding: 2px 5px; +} +.list-other > p { + display: inline-block; + margin: 0 10px 0 0; + font-size: 12px; + color: #666; +} + +.list-box-action { + position: absolute; + display: flex; + align-items: center; + top: 0; + bottom: 0; + right: 100px; + visibility: hidden; +} +.list-box:hover .list-box-action { + visibility: visible; +} +.list-box-action button { + display: inline-block; + margin: 0 25px; + width: 50px; + height: 50px; + color: #0089ff; + line-height: 50px; + text-align: center; + border: 0; + border-radius: 25px; + box-shadow: 2px 2px 5px 2px #eee; + cursor: pointer; +} diff --git a/src/military/components/sortBox/index.jsx b/src/military/components/sortBox/index.jsx new file mode 100644 index 00000000..b826aed4 --- /dev/null +++ b/src/military/components/sortBox/index.jsx @@ -0,0 +1,48 @@ +import React, { useEffect, useState } from 'react'; +import { Icon, } from 'antd'; +import classNames from 'classnames'; +import './index.scss'; + +export default (props) => { + const { options, changeOptionId, type, defaultValue } = props; + + const [myOptions, setMyOptions] = useState(options); + const [option, setOption] = useState(defaultValue || { name: "", type: "" }); + + useEffect(() => { + changeOptionId(option, type); + }, [option]); + + function itemClick(activeItem) { + const newOption = { + ...activeItem, + value: !activeItem.value + }; + for(const item of myOptions){ + if(item.type===activeItem.type){ + item.value=newOption.value; + } + } + setOption(newOption); + setMyOptions(myOptions); + } + + return ( + +
+ { + myOptions.map((item) => { + return
{ itemClick(item) }} > + {item.name} + { + item.icon && + + + } +
+ }) + } +
+ + ) +} \ No newline at end of file diff --git a/src/military/components/sortBox/index.scss b/src/military/components/sortBox/index.scss new file mode 100644 index 00000000..cbc72547 --- /dev/null +++ b/src/military/components/sortBox/index.scss @@ -0,0 +1,40 @@ +.sort-box { + display: flex; + justify-content: start; + align-items: center; + margin-left: 20px; + font-size: 1rem; + .sort-item { + display: flex; + align-items: center; + color: #333; + padding: 0 20px; + background-color: #fff; + &:hover { + background-color: #fff; + color: #409eff; + cursor: pointer; + } + } + .sort-item-checked { + // background-color: #409eff; + // color: #fff; + color: #409eff; + } + .caret-up-down { + display: inline-flex; + flex-flow: column nowrap; + margin-left:.25em; + font-size: .75em; + color:#ccc; + } + .caret-checked{ + color: #409eff; + } + .anticon-caret-up{ + margin-bottom: -.15em; + } + .anticon-caret-down{ + margin-top: -.15em; + } +} diff --git a/src/military/fetch.js b/src/military/fetch.js new file mode 100644 index 00000000..ee368840 --- /dev/null +++ b/src/military/fetch.js @@ -0,0 +1,112 @@ +import { notification } from 'antd'; +import axios from 'axios'; +import cookie from 'react-cookies'; + +// export const httpUrl='http://117.50.100.12:8001'; +// export const httpUrl='http://192.168.31.72:8081'; +export const httpUrl = 'http://106.75.31.211:58088'; + +// const TokenKey = 'autologin_forge_military'; +const TokenKey = 'autologin_trustie'; +axios.defaults.withCredentials = true; + +// 创建axios实例 +const service = axios.create({ + // baseURL: httpUrl, + timeout: 5000 // 请求超时时间 +}); + + +// request拦截器 +service.interceptors.request.use(config => { + if (cookie.load(TokenKey)) { + config.headers['Authorization'] = cookie.load(TokenKey); // 让每个请求携带自定义token 请根据实际情况自行修改 + } + return config; +}, error => { + // Do something with request error + console.log(error); // for debug + Promise.reject(error); +}); +// respone拦截器 +service.interceptors.response.use( + response => { + const res = response; + if (res.status == 400) { + notification.open({ + message: "提示", + description: '请求错误', + }); + return Promise.reject('error'); + } + if (res.status == 401) { + notification.open({ + message: "提示", + description: '未授权，请登录！', + }); + return Promise.reject('error'); + } + if (res.status == 403) { + notification.open({ + message: "提示", + description: '无权限', + }); + window.location.href="https://testforgeplus.trustie.net/403"; + return Promise.reject('error'); + } + if (res.status == 40001) { + notification.open({ + message: "提示", + description: '账户或密码错误！', + }); + return Promise.reject('error'); + } + if (response.status != 200 && res.status != 200) { + notification.open({ + message: "提示", + description: res.message, + }); + } else { + return response.data; + } + }, + error => { + let res = error.response||{}; + if (res.status == 400) { + notification.open({ + message: "提示", + description: '请求错误', + }); + return Promise.reject('error'); + } + if (res.status == 401) { + notification.open({ + message: "提示", + description: '未授权，请登录！', + }); + return Promise.reject('error'); + } + if (res.status == 403) { + notification.open({ + message: "提示", + description: '无权限', + }); + // window.location.href="https://testforgeplus.trustie.net/403"; + return Promise.reject('error'); + } + if (res.status == 40001) { + notification.open({ + message: "提示", + description: '账户或密码错误！', + }); + return Promise.reject('error'); + } + notification.open({ + message: "提示", + description: error.message, + }); + return Promise.reject(error); + } +); + +export default service; diff --git a/src/military/index.scss b/src/military/index.scss new file mode 100644 index 00000000..dfca5f05 --- /dev/null +++ b/src/military/index.scss @@ -0,0 +1,87 @@ +// 本模块公共样式 + +.centerbox { + width: 80vw; + max-width: 1280px; + margin: 40px auto; +} +.center-content { + background: #fff; + border: 1px solid #dedede; + box-shadow: #eee 0px 1px 1px 3px; +} +.centerScreen { + display: flex; + justify-content: space-between; + height: 46px; + background-color: #fff; + border-bottom: 1px solid #dedede; +} + + +// 内容标题右侧样式 +.center-right-but { + display: flex; + align-items: center; +} +.center-right-but > span { + margin: 0 10px; + font-size: 16px; + color: #0089ff; + cursor: pointer; +} + +// 通用标签样式 +.list-tag { + display: inline-block; + margin-right: 10px; + background: #cfe9ff; + color: #0089ff; + font-size: 14px; + border-radius: 3px; + padding: 2px 5px; + line-height: 25px; +} + +// 文件预览modal样式 +.file-modal { + width: 800px !important; + .ant-modal-body { + padding-top: 40px; + .pdf-box { + height: 70vh; + overflow-y: scroll; + } + } + .ant-modal-close { + top: 0 !important; + } + .show-img { + width: 100%; + } + .react-pdf__Page__canvas, + .react-pdf__Page__textContent { + margin: 0 auto; + max-width: 100%; + } +} + +.edit-input { + max-width: 500px; +} + +.none_panels{ + display: flex; + justify-content: center; + align-items: center; + flex-flow: column nowrap; + height: 40vh; +} + + +.newFooter .footerInfos>ul { + padding: 0 40px; + box-sizing: border-box; + max-width: 25%; + text-align: left; +} diff --git a/src/military/task.js b/src/military/task.js new file mode 100644 index 00000000..b573a4e8 --- /dev/null +++ b/src/military/task.js @@ -0,0 +1,67 @@ +import React, { Component } from "react"; + +import { Route, Switch } from "react-router-dom"; +import { withRouter } from "react-router"; +import { SnackbarHOC } from "educoder"; +import { CNotificationHOC } from "../modules/courses/common/CNotificationHOC"; +import { TPMIndexHOC } from "../modules/tpm/TPMIndexHOC"; +import Loadable from "react-loadable"; +import Loading from "../Loading"; +import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC"; +import './index.scss'; + +const TaskList = Loadable({ + loader: () => import("./task/taskList"), + loading: Loading, +}); + +const TaskDetail = Loadable({ + loader: () => import("./task/taskDetail"), + loading: Loading, +}); + +const TaskAdd = Loadable({ + loader: () => import("./task/taskEdit"), + loading: Loading, +}); + + +class Index extends Component { + render() { + return ( +
+ + + ( + + )} + > + + ( + + )} + > + + ( + + )} + > + + + +
+ ); + } +} +export default withRouter( + ImageLayerOfCommentHOC({ + imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget", + parentSelector: ".newMain", + })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index)))) +); diff --git a/src/military/task/api.js b/src/military/task/api.js new file mode 100644 index 00000000..522fd700 --- /dev/null +++ b/src/military/task/api.js @@ -0,0 +1,70 @@ +import fetch from '../fetch'; +import { notification } from 'antd'; + +// 获取字典分类列表 +export function getDictionary(id) { + return fetch({ + url: '/dicItem/getData?dicTypeCode=' + id, + method: 'get' + }); +} + +// 列表查询 +export async function getTaskList(params) { + let res = await fetch({ + url: '/api/announcements/', + method: 'get', + params, + }); + if (res.code === '1') { + return res.data; + } else { + notification.open({ + message: "提示", + description: res.message || '请求错误', + }); + } +} + + +// 详情查询 +export async function getTaskDetail(id) { + let res = await fetch({ + url: '/api/announcements/' + id, + method: 'get', + }); + if (res.code === '1') { + return res.data; + } else { + notification.open({ + message: "提示", + description: res.message || '请求错误', + }); + } +} + +//新增公告 +export function addTask(data) { + return fetch({ + url: '/api/announcements/add', + method: 'post', + data: data + }); +} + +//删除 +export function deleteTask(id) { + return fetch({ + url: '/api/announcements/' + id, + method: 'DELETE', + }); +} + +//更新 +export function editTask(data) { + return fetch({ + url: '/api/announcements/update', + method: 'put', + data: data + }); +} \ No newline at end of file diff --git a/src/military/task/static.js b/src/military/task/static.js new file mode 100644 index 00000000..dd380b5d --- /dev/null +++ b/src/military/task/static.js @@ -0,0 +1,19 @@ +// 公告开始 +export const taskStatus = [ + { code: 0, name: "关闭", dicItemName: '关闭' }, + { code: 1, name: "正常", dicItemName: '正常' }, + { code: 2, name: "草稿", dicItemName: '草稿' }, +]; + +export const taskType = [ + { code: 1, name: "更正", dicItemName: "更正" }, + { code: 2, name: "中标", dicItemName: "中标" }, + { code: 3, name: "废标", dicItemName: "废标" }, +]; + +export const taskChecked = [ + { code: 0, name: "未通过", dicItemName: "未通过" }, + { code: 1, name: "通过", dicItemName: "通过" }, + { code: 2, name: "未处理", dicItemName: "未处理" }, +]; +//公告结束 \ No newline at end of file diff --git a/src/military/task/taskDetail/index.jsx b/src/military/task/taskDetail/index.jsx new file mode 100644 index 00000000..f78ad68e --- /dev/null +++ b/src/military/task/taskDetail/index.jsx @@ -0,0 +1,63 @@ +import React, { useEffect, useState } from 'react'; +import { httpUrl } from '../../fetch'; +import { getTaskDetail } from '../api'; +import { taskStatus, taskType } from '../static'; +import './index.scss'; + +const taskStatusArr = []; +const taskTypeArr = []; +for (const item of taskStatus) { + taskStatusArr.push(item.name); +} +for (const item of taskType) { + taskTypeArr.push(item.name); +} + + +export default ({ match,history, showNotification }) => { + const [detailData, setDetailData] = useState({}); + const id = match.params.taskId; + + useEffect(() => { + id && getTaskDetail(id).then(data => { + setDetailData(data || {}); + }) + }, [id]); + + return ( + + +
+
+ {history.go(-1)}}>公告 >  详情 +
+
+
+
{detailData.title}
+
+
+
+ {detailData.publisher &&

发布单位：{detailData.publisher}

} +

发布时间：{detailData.publishDate || detailData.createdAt}

+

截止时间：{detailData.closingDate}

+
+ + {/* 富文本内容插入 */} +
+
+ + { + detailData.fileDownloadPath && +

公告附件：

+

{ window.open(httpUrl + detailData.fileDownloadPath) }} >{detailData.fileName}

+ + } + +
+
+ +
+ + + ) +} diff --git a/src/military/task/taskDetail/index.scss b/src/military/task/taskDetail/index.scss new file mode 100644 index 00000000..000938bc --- /dev/null +++ b/src/military/task/taskDetail/index.scss @@ -0,0 +1,37 @@ +.centerbox{ + position: relative; + .head-navigation{ + span{ + display: inline-flex; + align-items: center; + &:hover{ + color: #409eff; + } + } + } +} +.head-navigation { + position: absolute; + top:-2.3em; +} +// 内容详情 +.item-content { + padding: 10px 10px 0 30px; +} +.content-notice { + padding: 20px; +} + +.center-author { + display: flex; + align-items: center; +} + +.content-text { + margin: 1em 0; + min-height: 30vh; +} + +.content-download{ + color: #409eff; +} diff --git a/src/military/task/taskEdit/index.jsx b/src/military/task/taskEdit/index.jsx new file mode 100644 index 00000000..b9fc9125 --- /dev/null +++ b/src/military/task/taskEdit/index.jsx @@ -0,0 +1,247 @@ +import React, { forwardRef, useCallback, useEffect, useState } from 'react'; +import { Form, Input, Select, Button, DatePicker } from 'antd'; +import moment from 'moment'; +import Upload from '../../components/Upload'; +import { httpUrl } from '../../fetch'; +import { getDictionary, getTaskDetail, addTask, updateTask } from '../api'; +import './index.scss'; + +const Option = Select.Option; +const { TextArea } = Input; +const format = "YYYY-MM-DD HH:mm:ss"; + +export default Form.create()(forwardRef(({current_user, form, showNotification, match, history }, ref) => { + + const [requireType, setRequireType] = useState([]); + const [tagType, setTagType] = useState([]); + const [fileList, setFileList] = useState(null); + const [typeCode, setTypeCode] = useState(''); + const [typeName, setTypeName] = useState(''); + + const id = match.params.requireId; + const { getFieldDecorator, validateFields, setFieldsValue, } = form; + + useEffect(() => { + id && getTaskDetail(id).then(data => { + const formValue = { + title: data.title, + attachments: data.attachments, + // typeCode: data.typeCode, //为使用select labelInValue，在代码中初始化值 + endTime: moment(data.endTime), + tag: data.tag, + remark: data.remark + }; + setFieldsValue(formValue); + setTypeName(data.typeName); + setTypeCode(data.typeCode) + if (data.attachmentList.length) { + for (const item of data.attachmentList) { + item.name = item.fileName; + item.size = item.fileSize; + item.uid = "rc-upload" + item.id + } + setFileList(data.attachmentList); + } + }) + }, [id]); + + // 加载选项数据 + useEffect(() => { + getDictionary('requirement_type').then((res) => { + setRequireType(res.data); + }); + getDictionary("tag_type").then((res) => { + setTagType(res.data); + }); + }, []); + + + // 上传附件后得到的文件数组 + function UploadFunc(fileList) { + setFileList(fileList); + let files = []; + for (const item of fileList) { + files.push(item.id || item.response.data.id); + } + setFieldsValue({ + attachments: files.join() + }); + } + + const helper = useCallback( + (label, name, rules, widget, initialValue) => ( + + {getFieldDecorator(name, { rules, initialValue, validateFirst: true, })(widget)} + + ), []); + + const formItemLayout = { + labelCol: { + xs: { span: 12 }, + sm: { span: 4 }, + }, + wrapperCol: { + xs: { span: 12 }, + sm: { span: 16 }, + }, + }; + + const tailFormItemLayout = { + wrapperCol: { + xs: { + span: 20, + offset: 4, + }, + sm: { + span: 20, + offset: 4, + }, + }, + }; + + // 修改 + function saveItem() { + validateFields((error, values) => { + if (!error) { + let params = { + ...values, + createUserAccount:current_user.login|| sessionStorage.getItem("SET_Account"), //用户信息 + createUserName:current_user.username|| sessionStorage.getItem("SET_NAME"), //模拟时使用莫胜吕 + typeName, + typeCode, + status: 0, //状态 + }; + params.tag = params.tag.join(); + params.endTime = params.endTime.format(format); + if (id) { + // 编辑 + params.id = id; + updateTask(params).then(res => { + if (res.code === '1') { + showNotification("需求更新成功！"); + history.go(-1); + } else { + showNotification(res.message); + } + }); + } else { + // 新增 + addTask(params).then(res => { + if (res.code === '1') { + showNotification("需求新增成功！"); + history.go(-1); + } else { + showNotification(res.message); + } + }); + } + } + }) + } + + function changeTypeName(value) { + setTypeCode(value.key); + setTypeName(value.label); + } + + return ( +
+
+ +
+
{id ? '修改' : '新增'}需求
+
+
+ {helper( + "需求名称：", + "title", + [{ required: true, message: "请输入需求名称" }], + + )} + + {helper( + "需求类型：", + "typeCode", + [{ required: true, message: "请选择需求类别" }], + + , { key: typeCode, label: typeName })} + + {helper( + "结束时间：", + "endTime", + [{ required: true, message: "请输入结束时间" }], + + )} + + + + + {/* 用一个隐藏的input实现上传文件的必填校验 */} + {getFieldDecorator('attachments', { + rules: [{ required: true, message: "请上传需求文件" }], validateFirst: true + })()} + + + {helper( + "标签：", + "tag", + [{ required: true, message: "请选择需求标签" }], + + )} + + {helper( + "需求描述：", + "remark", + [{ required: true, message: "请输入需求描述" }], + +
+ + */} +
+
+

+ + + 歌曲ID代入演示.txt + + (299 Bytes) +

+
+ +
+
  • + 成果编号：#25698320 + 提交时间：2021-06-17 13: 45: 53 + 稿件状态：雇主已浏览 + + 举报 + 0 + + 2 + + +
    • +
    +
    + + + ) + }) + } + + {list.length > 0 ? +
    + {total > pageSize && { setPage(page) }} + current={curPage} + total={total} + showTotal={total => `共 ${total} 条`} + />} +
    : + } + + + ) +} + diff --git a/src/military/components/itemListAchieve/index.scss b/src/military/components/itemListAchieve/index.scss new file mode 100644 index 00000000..69399ed8 --- /dev/null +++ b/src/military/components/itemListAchieve/index.scss @@ -0,0 +1,20 @@ +.blue_line_btn { + color: #4CACFF!important; + border: 1px solid #4CACFF; + background: #fff!important; +} + +.base_smallBtn { + color: #ccc; + font-size: 14px; + background: #ccc; + border-radius: 4px; + height: 30px; + line-height: 30px; + display: block; + width: 100px; + box-sizing: border-box; + text-align: center; +} + + diff --git a/src/military/components/sortBox/index.scss b/src/military/components/sortBox/index.scss index cbc72547..f3e8d0e9 100644 --- a/src/military/components/sortBox/index.scss +++ b/src/military/components/sortBox/index.scss @@ -2,7 +2,7 @@ display: flex; justify-content: start; align-items: center; - margin-left: 20px; + margin-left: 10px; font-size: 1rem; .sort-item { display: flex; diff --git a/src/military/image/win.png b/src/military/image/win.png new file mode 100644 index 0000000000000000000000000000000000000000..4014a9df6824f6d4d14775e4fa8d637500c4ecd8 GIT binary patch literal 1635 zcmV-p2AuhcP)@JtRuv|pemP8fmZE^LaW``YEv*`2rALOyL!o0|jDwk+)T zV@zNl1ZHAnBry2;{4Ttn1Dbs38iOKpnxyNLY16|0-tQ9t+SHUFTT#_#9N0K_U*>5IU|wss~H}RppS& zL1zz?mLjvJAakc8rO8l2-yj*5$ozY+h@!&wmV126){zaXee*GNb0c(LL++n~UGaS= zibLpdYu-fnw7{TJ?DD1Pi8J_@ehsN^s2GlXcP?h~1SGI+61oMBlg4)~F!I!!Z1|xW<;}u;y7(=`#P;UbLwNGW}rU zc~0%mpULZAs><^lYRjMSzo^G7Ukv}afM5MOdhrTeNkKf0JaixCp{bBebmII<33u%O zqXfa1=t&v>t9Q_Ye*u>(P;{e$#um)O)A8H(;TzvYtYB9D5L(;ut6oFfFF;oof*3OW zF3fjk!+;Vm&i`5b&X!|pgD=wAWBj^p=;03v>M;Q_Z#wqJ-^1@bh?zAxPlZevUASap zN1=Tg^usgwbz9NK{op+^^)Afg4@N@pgzkNDjR&63Q*^C&u-~*B{rw*xmjN3?YNuh> zJOk+rlqT^nZN~qu8L6toy!hL=H3LeLU4(9xXhZWvjmI}@ zCOh8mIU>4c7xZ3(qEgI~`Itw)j$83sq1hXE;$PVSRTbE}HSob{+;gj-F9jqcT9C(U zF;nkU34#-n%RLqW4E8~=3}c?sQ)i3)iyPtMc_^>IzPJ=>K8OEV9d^YM{FWyC_TL~w zE3s>qp&zy5S8hZvUxBk7FnlQH`GrXJ@IIe&YXk3olD}x-jsufSVCv{ikMeKrL3cO9 zfKu!Wi(%9-WN0~9i{JJx^0kS1MNu{|fBEQ6;oon?|7Zg;c|t+X$wa#e{Q~ApIaIKU z`j#PDENfMyR@*NHe(hHH=uE*|Vlkv7iAH9Z>WA`yNMO)xBm_YMLDR0#mnY`H$f{67 zzujhdGH(@mfXM8I)yx-b)}T~I7NA>pqphbQmv`OkW)~SalL z2M&PSM<5f%BBO>y5)Sd&rRq=Pbe&D~)!#_9Pe$hJ%|%oMRZjdAgUrR+yVdy$`ZL9O zyN)6=T44+%Vo;Rm6C)jj?x+`Suxbv_5nh&s)B67>GXFEIb^WmzLpsXBAU+Q49AnJ` zh7`qOXku%jk2xp^GTj;kom@wEy h%(uzxDYtyK{0qHH-nRRlTEhSU002ovPDHLkV1n0rD2f08 literal 0 HcmV?d00001 diff --git a/src/military/image/winner.png b/src/military/image/winner.png new file mode 100644 index 0000000000000000000000000000000000000000..9cadadabaaadaa11a053d54a5f7a30e2c99bc753 GIT binary patch literal 8573 zcmV-@A%fnCP)IUr(5B-SV<_HJT~yPISa%O+9R5{+rrteTC9i*d6m zDAuS^V=sh=GD8ojpdh`&%rNCE_dWZZd%uAJ27|`rKF>UY-*D%?=brOF=lswAjPOss z6a)yiFtQ?zmO~;?=q^Y?2r~πxU(TY-XyhBVp=VJqZYU_nv9|1%%k9{3-ADLAOj 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 D>w>EE literal 0 HcmV?d00001 diff --git a/src/military/index.scss b/src/military/index.scss index b600dba0..35ede431 100644 --- a/src/military/index.scss +++ b/src/military/index.scss @@ -11,25 +11,29 @@ .color-deep-blue{ color:#1B8FFF; } +.text-center{ + text-align: center; +} .centerbox { width: 80vw; - max-width: 1280px; + max-width: 1200px; margin: 40px auto; position: relative; } .center-content { + padding-top:5px; background: #fff; - border: 1px solid #dedede; - box-shadow: #eee 0px 1px 1px 3px; + box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.05); + border-radius: 5px; } .centerScreen { display: flex; justify-content: space-between; - height: 46px; + height: 60px; background-color: #fff; border-bottom: 1px solid #dedede; -} +} .head-navigation { position: absolute; @@ -106,4 +110,23 @@ .ant-modal-footer{ text-align: center; -} \ No newline at end of file +} + + +@media screen and (max-width: 1200px){ + .centerbox { + width: 100vw; + } + .newHeaders{ + min-width: 325px; + } + .newContainers{ + min-width: 325px; + .newMain{ + min-width: 325px; + } + } + .newFooter{ + min-width: 325px; + } +} diff --git a/src/military/task/myTask/index.jsx b/src/military/task/myTask/index.jsx index 484bb59c..e6e99de4 100644 --- a/src/military/task/myTask/index.jsx +++ b/src/military/task/myTask/index.jsx @@ -1,8 +1,9 @@ import React, { useEffect, useState } from 'react'; -import { Tabs, Input, Button, } from 'antd'; +import { Tabs, Input, Button,Table,Pagination } from 'antd'; import StatusNav from '../../components/statusNav'; +import ChooseNav from '../../components/chooseNav'; import ItemListMyTask from '../../components/itemListMyTask'; -import { taskStatusAllArr, } from '../static'; +import { taskStatusAllArr, applyStatusArr } from '../static'; import { getTaskList, getTaskCategory } from '../api'; import './index.scss'; const Search = Input.Search; @@ -11,6 +12,7 @@ const { TabPane } = Tabs; const publishStatusArr = taskStatusAllArr.slice(3); const unpublishStatusArr = taskStatusAllArr.slice(0, 3); +const columns=[]; export default ({ location, history, current_user }) => { let defaultValue = decodeURI(location.search.split("=")[1] || ""); @@ -25,6 +27,8 @@ export default ({ location, history, current_user }) => { return defaultValue === 'false' ? '0,1,2' : '3,4,5,6,7,8'; }); + const [requireAchieve, setRequireAchieve] = useState('1'); + const [searchInput, setSearchInput] = useState(''); const [orderBy, setOrderBy] = useState(''); const [curPage, setCurPage] = useState(1); @@ -81,6 +85,16 @@ export default ({ location, history, current_user }) => { setCurPage(1); } + function changeIdentity(key) { + setIdentity(key); + if (key === '1') { + setStatusString('3,4,5,6,7,8'); + } else { + setStatusString('0,1,2'); + } + setCurPage(1); + } + function changeStatusType(key) { if (key === '1') { setStatusString('3,4,5,6,7,8'); @@ -91,10 +105,21 @@ export default ({ location, history, current_user }) => { setStatusType(key); } + function changeRequireAchieve(key) { + if (key === '1') { + setStatusString('3,4,5,6,7,8'); + } else { + setStatusString('0,1,2'); + } + setCurPage(1); + setRequireAchieve(key); + } + return (
    - { setIdentity(key) }}> + + { /> + - 请稍候 + + setSearchInput(value)} + /> + } + > + + + + + + { setCurPage(page) }} + loading={loading} + /> + + + + + + row.id} + dataSource={taskList} + columns={columns} + pagination={false} + /> + {taskList.length > 10 && + { setCurPage(page) }} + current={curPage} + total={total} + />} + + + diff --git a/src/military/task/static.js b/src/military/task/static.js index 83893f4d..51074db8 100644 --- a/src/military/task/static.js +++ b/src/military/task/static.js @@ -52,7 +52,11 @@ export const sortArr = [{ desc: false, },]; - +export const applyStatusArr = [ + { dicItemCode: '0', name: "待确认", dicItemName: '待确认' }, + { dicItemCode: '1', name: "未采纳", dicItemName: '未采纳' }, + { dicItemCode: '2', name: "评选胜出", dicItemName: '评选胜出' }, +]; export const formItemLayout = { labelCol: { diff --git a/src/military/task/taskDetail/index.jsx b/src/military/task/taskDetail/index.jsx index 5ba31038..cd5e260f 100644 --- a/src/military/task/taskDetail/index.jsx +++ b/src/military/task/taskDetail/index.jsx @@ -1,69 +1,164 @@ -import React, { useEffect, useState, useCallback } from 'react'; +import React, { forwardRef, useEffect, useState, useCallback } from 'react'; +import { Form, Input, Button, Modal, Table, Pagination } from 'antd'; +import classNames from 'classnames'; import { Link } from "react-router-dom"; import { getImageUrl } from 'educoder'; -import { httpUrl } from '../../fetch'; +import Upload from '../../components/Upload'; +import StatusNav from '../../components/statusNav'; +import ItemListAchieve from '../../components/itemListAchieve'; import { getTaskDetail, getTaskCategory } from '../api'; -import { taskModeIdArr} from '../static'; -import './index.scss'; -import classNames from 'classnames'; +import { taskModeIdArr, applyStatusArr } from '../static'; +import { httpUrl } from '../../fetch'; -const taskModeNameArr=[]; -for(const item of taskModeIdArr){ - taskModeNameArr[item.dicItemCode]=item.dicItemName; +import winpng from '../../image/win.png'; + +import './index.scss'; +const { TextArea } = Input; + +const taskModeNameArr = []; +for (const item of taskModeIdArr) { + taskModeNameArr[item.dicItemCode] = item.dicItemName; } -export default ({ match, current_user, history, showNotification }) => { - console.log(current_user); - const id = match.params.taskId; - const [detailData, setDetailData] = useState({}); - const [taskCategoryValueArr, setTaskCategoryValueArr] = useState([]); +const columns = [ + { + title: '应征者姓名', + dataIndex: 'name', + }, + { + title: '投稿时间', + dataIndex: 'age', + }, + { + title: '状态', + dataIndex: 'status', + render:(text,record)=>{ + return + } + + }, + { + title: '详情', + dataIndex: 'detail', + }, +]; + +export default Form.create()( + forwardRef(({ match, current_user, form, history, showNotification }, ref) => { + console.log(current_user); + const id = match.params.taskId; + const { getFieldDecorator, validateFields, setFieldsValue } = form; + + const [detailData, setDetailData] = useState({}); + const [taskCategoryValueArr, setTaskCategoryValueArr] = useState([]); + const [fileList, setFileList] = useState(null); + + const [applyModal, setApplyModal] = useState(false); - // 获取任务领域数组 - useEffect(() => { - getTaskCategory().then(data => { - if (data) { - const taskCategoryValueArr = []; - for (const item of data) { - taskCategoryValueArr[item.id] = item.name; + const [curPage, setCurPage] = useState(1); + const [total, setTotal] = useState(0); + const [orderBy, setOrderBy] = useState(''); + const [dataList, setDataList] = useState([ + {name:'测试方式',id:1}, + {name:'测试方式',id:2}, + {name:'测试方式',id:3}, + {name:'测试方式',id:4}, + ]); + const [loading, setLoading] = useState(false); + + + // 获取任务领域数组 + useEffect(() => { + getTaskCategory().then(data => { + if (data) { + const taskCategoryValueArr = []; + for (const item of data) { + taskCategoryValueArr[item.id] = item.name; + } + setTaskCategoryValueArr(taskCategoryValueArr); } - setTaskCategoryValueArr(taskCategoryValueArr); - } - }); - }, []); + }); + }, []); - useEffect(() => { - id && getTaskDetail(id).then(data => { - setDetailData(data || {}); - console.log(data); - }) - }, [id]); - const process = useCallback((title, days, active) => { - return ( -
  • - {title} - {days &&

    - {days}天 + + useEffect(() => { + id && getTaskDetail(id).then(data => { + setDetailData(data || {}); + console.log(data); + }) + }, [id]); + + // 流程步骤显示 + const process = useCallback((title, days, active) => { + return ( +

  • + {title} + {days &&

    + {days}天

    } -
    • - ) - }, []); + + ) + }, []); - function downFile(item) { - let url = httpUrl + '/busiAttachments/download/' + item.id; - window.open(url); - } + function downFile(item) { + let url = httpUrl + '/busiAttachments/download/' + item.id; + window.open(url); + } - return ( - + + const helper = useCallback( + (label, name, rules, widget) => ( + + {getFieldDecorator(name, { rules, validateFirst: true })(widget)} + + ), + [] + ); + + + // 上传附件后得到的文件数组 + function UploadFunc(fileList) { + setFileList(fileList); + let files = []; + for (const item of fileList) { + files.push(item.id || item.response.data.id); + } + setFieldsValue({ + uploadFileNumbers: files.join() + }); + } + + + // 提交成果 + function saveItem(status) { + validateFields((error, values) => { + if (!error) { + + } + }) + } + + function changeOptionId(option, type) { + // if (type === 'publishStatus') { + // // setStatusString(option.dicItemCode.toString() || '3,4,5,6,7,8'); + // } else if (type === 'unpublishStatus') { + // // setStatusString(option.dicItemCode.toString() || '0,1,2'); + // } + // setCurPage(1); + } + + + + return (
    创客空间 > 任务大厅 > -  任务编号：{detailData.number} +  任务编号：{detailData.number}
    @@ -123,9 +218,9 @@ export default ({ match, current_user, history, showNotification }) => { { detailData.tasksAttachments.map(item => { return
    - + { downFile(item) }}> - {item.fileName} + {item.fileName} ({item.fileSizeString})
    }) @@ -136,7 +231,7 @@ export default ({ match, current_user, history, showNotification }) => {
    知识产权说明：

    1、参赛作品一经采用，其所有权、修改权和使用权均归主办方所有，设计者不得再在任何地方使用；
    - 2、应征者所提交的作品必须由应征者本人创作或参与创作，应征者应确认其作品的原创性，主办单位不承担因作品侵犯他人（或单位）的权利而产生的法律责任，其法律责任由应征者本人承担。 + 2、应征者所提交的作品必须由应征者本人创作或参与创作，应征者应确认其作品的原创性，主办单位不承担因作品侵犯他人（或单位）的权利而产生的法律责任，其法律责任由应征者本人承担。

    交稿声明：
    @@ -146,8 +241,176 @@ export default ({ match, current_user, history, showNotification }) => {

    -
    -     + {/* {detailData.status == '3' ? */} +
    + +
    - ) -} + {/* : */} +
    +
    我要应征投稿：
    + {helper( + "", + "achievementRemark", + [{ required: true, message: "请输入" }], + -
    - */} -
    +
    + { + item.paperDetail.busiAttachments && item.paperDetail.busiAttachments.map(fileItem => { + return
    + { downFile(fileItem) }}> + {fileItem.fileName} + ({fileItem.fileSizeString}) +
    + }) + } +
    + + {/* + */}
  • - 成果编号：#25698320 - 提交时间：2021-06-17 13: 45: 53 - 稿件状态：雇主已浏览 + 成果编号：#{item.number} + 提交时间：{item.createdAt} + 稿件状态：{item.read ? '雇主已浏览' : '雇主未浏览'} - 举报 - 0 - - 2 - + { setReportVisible(true); setCheckedItem(item) }}>举报 + { commentEdit(item.id) }}>0 + { thumbUp(item.id) }}>{item.thumbsUp}
    • -
    + + + { + setCommentHtml(html); + }} + /> + + +
    - - ) - }) - } - {list.length > 0 ? -
    - {total > pageSize && { setPage(page) }} - current={curPage} - total={total} - showTotal={total => `共 ${total} 条`} - />} -
    : - } - + ) + }) + } + + {list.length > 0 ? +
    + {total > pageSize && { setPage(page) }} + current={curPage} + total={total} + showTotal={total => `共 ${total} 条`} + />} +
    : + } + + } + + + { setReportVisible(false) }} + className="form-edit-modal" + > +
    +

    你的申诉信息将发送给平台管理员

    +

    请如实填写有效的申诉原由，我们将尽快完成审核

    + +
    + + */} +
    +
    +

    + + + 歌曲ID代入演示.txt + + (299 Bytes) +

    +
    + +
    +
  • + 成果编号：#25698320 + 提交时间：2021-06-17 13: 45: 53 + 稿件状态：雇主已浏览 + + 举报 + 0 + + 2 + + +
    • +
    + + + + ) + }) + } + + {list.length > 0 ? +
    + {total > pageSize && { setPage(page) }} + current={curPage} + total={total} + showTotal={total => `共 ${total} 条`} + />} +
    : + } + + + ) +} + diff --git a/src/military/components/itemListAchieve/index.scss b/src/military/components/itemListAchieve/index.scss new file mode 100644 index 00000000..69399ed8 --- /dev/null +++ b/src/military/components/itemListAchieve/index.scss @@ -0,0 +1,20 @@ +.blue_line_btn { + color: #4CACFF!important; + border: 1px solid #4CACFF; + background: #fff!important; +} + +.base_smallBtn { + color: #ccc; + font-size: 14px; + background: #ccc; + border-radius: 4px; + height: 30px; + line-height: 30px; + display: block; + width: 100px; + box-sizing: border-box; + text-align: center; +} + + diff --git a/src/military/components/sortBox/index.scss b/src/military/components/sortBox/index.scss index cbc72547..f3e8d0e9 100644 --- a/src/military/components/sortBox/index.scss +++ b/src/military/components/sortBox/index.scss @@ -2,7 +2,7 @@ display: flex; justify-content: start; align-items: center; - margin-left: 20px; + margin-left: 10px; font-size: 1rem; .sort-item { display: flex; diff --git a/src/military/image/win.png b/src/military/image/win.png new file mode 100644 index 0000000000000000000000000000000000000000..4014a9df6824f6d4d14775e4fa8d637500c4ecd8 GIT binary patch literal 1635 zcmV-p2AuhcP)@JtRuv|pemP8fmZE^LaW``YEv*`2rALOyL!o0|jDwk+)T zV@zNl1ZHAnBry2;{4Ttn1Dbs38iOKpnxyNLY16|0-tQ9t+SHUFTT#_#9N0K_U*>5IU|wss~H}RppS& zL1zz?mLjvJAakc8rO8l2-yj*5$ozY+h@!&wmV126){zaXee*GNb0c(LL++n~UGaS= zibLpdYu-fnw7{TJ?DD1Pi8J_@ehsN^s2GlXcP?h~1SGI+61oMBlg4)~F!I!!Z1|xW<;}u;y7(=`#P;UbLwNGW}rU zc~0%mpULZAs><^lYRjMSzo^G7Ukv}afM5MOdhrTeNkKf0JaixCp{bBebmII<33u%O zqXfa1=t&v>t9Q_Ye*u>(P;{e$#um)O)A8H(;TzvYtYB9D5L(;ut6oFfFF;oof*3OW zF3fjk!+;Vm&i`5b&X!|pgD=wAWBj^p=;03v>M;Q_Z#wqJ-^1@bh?zAxPlZevUASap zN1=Tg^usgwbz9NK{op+^^)Afg4@N@pgzkNDjR&63Q*^C&u-~*B{rw*xmjN3?YNuh> zJOk+rlqT^nZN~qu8L6toy!hL=H3LeLU4(9xXhZWvjmI}@ zCOh8mIU>4c7xZ3(qEgI~`Itw)j$83sq1hXE;$PVSRTbE}HSob{+;gj-F9jqcT9C(U zF;nkU34#-n%RLqW4E8~=3}c?sQ)i3)iyPtMc_^>IzPJ=>K8OEV9d^YM{FWyC_TL~w zE3s>qp&zy5S8hZvUxBk7FnlQH`GrXJ@IIe&YXk3olD}x-jsufSVCv{ikMeKrL3cO9 zfKu!Wi(%9-WN0~9i{JJx^0kS1MNu{|fBEQ6;oon?|7Zg;c|t+X$wa#e{Q~ApIaIKU z`j#PDENfMyR@*NHe(hHH=uE*|Vlkv7iAH9Z>WA`yNMO)xBm_YMLDR0#mnY`H$f{67 zzujhdGH(@mfXM8I)yx-b)}T~I7NA>pqphbQmv`OkW)~SalL z2M&PSM<5f%BBO>y5)Sd&rRq=Pbe&D~)!#_9Pe$hJ%|%oMRZjdAgUrR+yVdy$`ZL9O zyN)6=T44+%Vo;Rm6C)jj?x+`Suxbv_5nh&s)B67>GXFEIb^WmzLpsXBAU+Q49AnJ` zh7`qOXku%jk2xp^GTj;kom@wEy h%(uzxDYtyK{0qHH-nRRlTEhSU002ovPDHLkV1n0rD2f08 literal 0 HcmV?d00001 diff --git a/src/military/image/winner.png b/src/military/image/winner.png new file mode 100644 index 0000000000000000000000000000000000000000..9cadadabaaadaa11a053d54a5f7a30e2c99bc753 GIT binary patch literal 8573 zcmV-@A%fnCP)IUr(5B-SV<_HJT~yPISa%O+9R5{+rrteTC9i*d6m zDAuS^V=sh=GD8ojpdh`&%rNCE_dWZZd%uAJ27|`rKF>UY-*D%?=brOF=lswAjPOss z6a)yiFtQ?zmO~;?=q^Y?2r~πxU(TY-XyhBVp=VJqZYU_nv9|1%%k9{3-ADLAOj zK%yp(uTpd`h0h6EEl5{^t{NH4rNG;_C&9NV(jurCt3i?Vper1~+9bKv>nSw!U_r}2 z!(jhVBPj$hw!A=bprQjo1_;v6qk}=p1-gJ{K|H8{C};>MkOXnWo@XC6dDtT8D&PY_ zKLnkh#H|E22=#@3)Z6}t7|D#&$k3`RnZX`c3k(DH7T5>K0_Fit3X23bDB2*%3Xe|+ zu1O*TkyNxhNEe`wp#2nj#(!54Sfj{N&^Zo2BLNE`w?SBt|E!JmnHnh$tFaXY@@AaF z95MnJqEG`Afp_gtAd3WDlB2Ms0xdwk2w@%!Zn}lgDv+18lqHg6gBtSb9NHBU{R4EE zLi7dn1~vi9KxR1n)HaIqE10|Cvkb$}%t*@6RG#dHLo2|QH<1oA z$lghGO#wMgqYNj*1nmYqMN}W@7p+DDKVNaxW*kR2EkUrhnbr+OBwxk6#vSi(Mju&~ zCpZ%1BJ*b89Yr5V!)ro)i@A~+r+^Mrg0lsk0B%N(wjWe7cirw>?Nb}6g%N#)-~@-8 z0E|>v;^DV#=<_wyH+1}gjnsC}Am=+|kVY8AexPrFoCz9$TMl|`$>U}z{%Hex!JVKm z*lZ-oyNbR5GStKJG)xg@EZ_NH=5~2T4fZ6)3gLzjsVk#?9SrMIAT=1=If_mYqz_OQ zmlXPq1obcNE-XKlk(6Q8dD6#&o~+0b0+xnYHxj$pi?|@!1mP6MhA_G^aMsLYHxXnfE{FC53^GwCc*Ugc87D8NFb|?v{sgp zIZ$!uf*e=Mh*pNQUsf_qZlmc3U3hn6XWsOQjb!nkLyi{oRH7^<3mxI@31&@ecYnj1 zW`_1kQ+}SJ{RLU2k+=EBK+bb8Uy;gEfjKuo>pXN(Fm>uTmc#a$QOjgIeQUy znC&=XcvIW0fSVw&Klo=8)K8bV_S$yE75?yUA*ouAoTqT4L0wVhM9y~!eD#w+~7;vUE;`U|BnH%)pY zywkAr0rw<7oAH{UtP&bJhP85JqM7FIN&F!WInU!Q+jfV*D)+dtNv9x}FZszX$2RX- zDsX;+8E@_EO?zylt$e;$g3QSdPE)iexZ6@}el&jb_80?G_UHD)DkHn*Nn9$(847a> zG=IN>1#3DphIy#9Asg5l1XMUBp*6II&=|r}^OmslGNLxwg71+aafE|&frF#;pGhQ0 zCSa>MG05Nn$QMT8UwsEYSg|`pwSnH-O!2yEW?PN7?b;(Ftz&3K7qVY;QNhOHR;Za*1PRsYU#F(LQRHXE6lQ1VOzW_1Jh7eRUp;Z!QLLadbF!U zoQI-Dy@_9E_>+QV?V%U{JOky*o(013hB*#KDRhG{Ae+UVb`%Wkhrj0$XxNIo^nBcR z&cHwTJpN}BVXIXGiB1wD)-<1+q|V@D+q3>nBUzjms2!njrey~~H-TP}VrKnzuNjvu zP&mWEIFJ552{U(BoGJY?d1?lLI}p_Ry1g9Y6~9GsDM1YrGR6oftoIaWWoex!yw|jZ z{+ZrX_X=J$sV4?*^zHg1_>=@l&2h#*Zbq??V+r!{TM2 zW~5z?-vavEt>}#%%a}bd((v*;sjq;Vk%lY$SDNJSgtx2$j;=V|YP*C4M|k|PMG7~U zF~=y3j-cvbM4vpt;fjm~$;1YixuEYWw4^DvLAnhJZY!a9ip4He8QCUn1ib?M3BWnT zQTF>XL<=MZ3dYem?HXufZ!bDE`ZJ;6oC>`#Bt0i@*8z_&X;WY(f5V-9EIR8wiYH$NtJlU!Zx?UUX2IQ=py4L- z-geyIZDKL3$&)w{oYh1J3VK_T)`!|T8w1=BImW{Y;AVS5E7CqplX|t?)8ev04p#IO z5b^jI)A+YxwzU%I^guOv~H-*zw$R*N5h7{SDAVD(0dXIuvB zHxt}=DefC5;pZ-fYzo0qnamLbi+gjZdLcd-lesc{RF%tjFN$8(vM=+s&G*XyCVjo{m-jqRDI*fWJ+1Dl(mOZPT{Aj7N`RyW0U)j`7q_jN_>hu)v2 z{=?2v`6g-A(_IRb3E?$ z%OD8i|6gX{?$7CcYlU1UyY0zNigZB(3+=s>JMT5dvW`?lQ${+74(cW^_HzW zzlx^YgR0Zet0#&7{R#B!iog19G?hg9_QXH%M_9Qw_N;!r z3GTff88-~JG@-B6p@01lcj-A%8Bjdqhp=D)bnA(`<@*GujVJugmHWl`uPlhC6E>C*$<)QJ1`sYqoxR8=A; z9u{XM%VwJz39q;deRe7o^N=k=zIGCBd@cIetN7Rc0*NHSZ9l+$^$Uc*eiVQ6?;;Fy zXP$uj`L`oXDxP&U%rjQGQ*W9l$iNfnaAWq{(jr7uJFc5!A?{2uG55b*v z4D8z%|I{1Ef&1ac4MW#$LH64##+dg$!awjF{{ClSrM(vyRRePPDBMrJg+4b8f9L&B z$Rj5nMev)epd}aKmDCPFjyf3mTrae_jqv(=(0d+-R%3e2P}?s-H+Z;pH%988$i4^e}o)08vo3np=$+l&=7RSUy(zG zp|8%sKRuP;M;Av23V(7h^xq5VT8Y1760BPb{rZx)`|3E${rXY(Xccn8;mFYkTlE1O z8_+jqM(v5tdq2jq#E=f~2 zKQ_Yf@&c)|f%60z3EYyv-?g3AI5Gjv-Scp$gY!VgDZV=tlT>#@&igW~--5n6J@Oc- ztVEX>F{!xoC&b}mwT*MQ!-k{lw;UAtW=n zvyaE!dTE^93h}_4c>?37t?3-CNVlj-swjgV zU6BI@5Zrzlnk%3$za3|y4^|RhehX||2m1^lc<3f%)L>{cT0@bFvbfH9V-~dKkRwJS zeaz+|`sPgh|2>O;>_up`4CP?2-UR=19qz=#(2rK*C%=F`^a8qc1vFV>YbP=Qw6AD{ zZY9gpicU$!1A!f=XFGFe#7a5k|>(&ca!B|-{%C-z7LjF+utJb809G@7UXdEaIV#JbXAQJ8!%CQ??Ad&#lu~61rEz`c2Si_Sj~e28E>#eKdi80@{`vmM*7XwjaI9W8kUZv~#=EnI}a} ztwT@pFcM@zE4jP6mT1kGsO#?#Ru*3kAd5ZvNE-JPw5^m<1FnqeT_8N(Bb6ac zE2DC*@cIt4aHrvxXVm^4IoRR0rjWN`#!48T&5`LFpeHH*Od%Yk5_F|9E3)6`klLa6 zKfVTy&B#Tk5d7O|(61+~+JJxLW!%@kj4ob@PMaMyq;B+(7n zInvUG+JVY5_#aP1=PZs2J^%FUuxU$NGaWaM@T&ht_U((i^lVtODM|oj)39P~R4V9; z)6u!_MYT_`h zrbQ^Xj@+8OczhJ>LsBZKsz7QF#GQXUa^z?t{K*%il4GIu`{3_>4FB85kkgMQxcPhNBQK+iSKxm1 z&8S(`x_9xf%|IW0xs!8wCCP#BX}S;kYZl7L!*mOh*nK z4q=G@>F<#5ofY9hc-9YK%}N-2Ac^1K0M(VyqdF$U&b|_sEho71YUKDs@mKwK^trqI zT*R_rYc3+i{39>npMI0z#(#xw)%bg!L@LYBzsy3H87my6^MWZzJo+~9U<#QAl)!U**2)pbsT@SF>GHU{VPQi4tb)1rpY}@Y-Gn0TTIAMBs)^089C;5CXC8P z{Zw@q+>QT^Gc4KEfWA44DBQ-6jt(Np1n#u)__}wajAd1F@xp6i{W{1ekl}-1-4@)% zU&USY6~bRl!T<415)-eDGE(vME1<0f_rq`ECLD&;bU_QnD8#}m?*M!Bz51XFmq4Ka zMN2v^ugC__sR91Mfcy-YzoGq5I}S<5b_ofO@#qpkYCO6&MdiYFLl!vb2#?$mSKInf ziu4m5x%+MREHL_LMQ*iO`;KGa5Gu-X7kw3X>Uh|vH~Pv9{FIjoZuuT`twjIu26Dn- zP?1IJ7b4YN&<~c!-12|^8Wt>yNHIC2mSECPqAJ?IR);&|DD>?G_y?ZF9d`(F(h*RW zjY7-6^bY!)$I<$~#^Seatf9{-&PGhH3Vw0|KMQ6V26-4-ohRF~mHgU{?SwM6UyHGTn3{wO{w{1i!f^?zu{xysqCI zg>96nR&T_=@(ybK)y##F*LGl*P0nLD@sgmE6S#Tsj%l7EnQo5JgB*I4&F2!V`Loe7 zrSx7=pyF)7n_kH@QwuzWyVA_DX^3xRNVg0XHz;ajus;dK2hz;l1+=5K#Hfz~<>v|9 z8V~r|FGDJgQm#Ac$T;No>r43Kd(l_xaF?Hh`}XNk!6bveuUQH) zYxu~mxDkU;OXKAw-NMRs_&>cBWjS5G5*m!ZwvdXNPHVJE9XXR*Xnwb&AZ$D5l{n8K zTSIs_L*0k%7+YXetq}a&1{fNZ1bTClmMQIko@eApNc`GIIw*a*NN!RE^KFE(%T)sI zF?$!#2Y?RV6hbDATrh#)N8gO_Nm5DtGgG59?Y?sw?kiu6Dq@?lOEw)*5aCbmfmQ3k z8@R@o95#}`io^LI5MK4GC=nP7uCq&C6Va#b9l11vm<-u8N>h>)7RgRy=h#4F4uH^@ z&58g&CBZD4x<-|<4M21B_^yNRfIg@2=OX&X_SR}(x{ay}9Q=m~QcdlWX46Z%(^!^_ zG%#JD>xCdDa4=gK!F}Z z6n~N;)k^s68a7WGP!f@v|FT~BawN0NW+b;*=P#kEjGG+gYXIkvtJZr>F8sFX%wHU-K@#j#vp63su6M4sr3 zBH0!R+YzXLra+H>1^qEd*B!7a^5PH%4j}R5FOmKF;f>08{xA5S{sx*`aOZvncl+fr z3HH^?V5Px{d6Qk%3PtI=y(72SY6Oh(o#OF-NYT2Yo!uhz z=-t|=-Ou430_$_TE$IPRk|Df}PaApF+PVEtOyt1rPFKR~)yQ~dh1u-pjx zb|YFi(+9j*=#i~Ya^vRK5fdk1d=Txd&gQ!P1_bgfS59F z7Sylp7#_;-o&{2-S1>)M$qmN}V(Pi;Q_PqV8$N;+6L3j7)2V)f=E_-qU`2 zBaLpKc03?Pg(of={qZ4*a&nVL)+#<0Q@pXs$V*)?pZwc>rVFB7Wc(6mK z5UcEW`n&+Wdk`4e9yr3wZiS^QJIt)w!^+0S(LXitvGh9+m{dexTFb_D9Y8i(v&hlb zJ0R#K(cXw8LQ{moh5%YUep4#Wb}c&}#)hPMx_r*T^%~U<@|r_e#8SZUXR!{v-gYpw zuf%2=%@bsbM7Z$)PfMgU>U0p0hpCD01*2;7>_VxDyKNp(=p4+CIrj zLrH_sw}?N>bl(aqfG>jBOehKZj3AFE$j#Z#JVtZElLfiL$NMK!J^qypnZI<_r|pp^ z#Q-<7B2W1b1+`+UV%LATgV)%{1w}3H{{s480XMyzL_;gh-Gs7)(3%QJ_V93xpw|k{ z#^XLgYN{E^c0^(iTF|_sWH4qYa-@0+VLCMiOAB&M}K}V;hNW3Dv)2U{AkBwyCn4{JdA&-EX;&wNh0kw{Ny+msX;e!c^ zvtaJVlB&eDFsgS7_VFZaerNYc+LDMv&Tz;Z0qdsN-bj(^Lp=0y=w`cLlH8&^DO(`4 zY-gGFEReKPyf{T>O@YEG#G%s_^cD}Vr>V2uxox!TDr(ER;U*~lyAn@!rYrufkm4Iz z=Gscf9xvs5tg0kW|>0C6sR2q?qR^>F?N~o zVXZ`6vzy!s3o6;P6}t7vQ?$|2euBP~WYg@9eNahLnSgvnfpmY{1h6&JHr)Mo(=>XO zpyLJEY(jX4*!*s^pf4&soTTO10%az3u4*MWv5I*OFs5fTt?aO>WiKVqK}H;&3GOtT z=?lCAI=cujW~pEPNj#|CSi3cneS?XsDv;|1F3_lburYA>aFW7%_Hd=J+}F001UFh> zl<9gx{1ioA$Wp(mGf{ioVx-Dob`y;4Qy{z!WFW8{e7z~_?C$~(EB@Uk5>M9PDvJ~j zNYFC9V`bic5PQ}#I9!kmY(T2$atCu2sY^wMsxvYBr`iJlSR=Ko)r=^21aBq?7wp{Q zY-C`Ua;gq7Jx-|@9AL{ez&!AO%o9$nDB)CRE*`7-H*|BjWP(%=iFQnMqvD1-!jEj_ zJw@YtusCmmdi!sOaE^B7T1Xv`Ah2yI+quicJzKQDGCfVQ9^UG7=Wb6!?qiKq!WCyT zH<)Y7#hrqk(l1+}&;Fn$Vcr)oL+x*UiNFkn=RCzZ8T|T>zt8r~g7z&Vs5ivlHY|)o zw|^Qcs*0ord&IowsCY{u5@rNe@MO3ED#k?9iza6u-28(q+4`tEo*@K~(~=5UL9CHTJ7Gj1Dmdz!pVJ z<6mkHlMZPJ@m|o40YR(cH|1$tSx#k3jAx4rpEj+3l4JkVjI@)7mB84V+`u+xGHpmw z2m&Pxg@m;rIVBl}6x%AuwZ?1jb8Q0q5A&Ga8Sei9$LQ7Hkx7Uz00000NkvXXu0mjf D>w>EE literal 0 HcmV?d00001 diff --git a/src/military/index.scss b/src/military/index.scss index 34c1d647..a24182fd 100644 --- a/src/military/index.scss +++ b/src/military/index.scss @@ -11,6 +11,9 @@ .color-deep-blue{ color:#1B8FFF; } +.text-center{ + text-align: center; +} .centerbox { width: 1200px; margin: 40px auto; @@ -27,23 +30,24 @@ } } width: 80vw; - max-width: 1280px; + max-width: 1200px; margin: 40px auto; position: relative; } .center-content { + padding-top:5px; background: #fff; - border: 1px solid #dedede; - box-shadow: #eee 0px 1px 1px 3px; + box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.05); + border-radius: 5px; } .centerScreen { display: flex; justify-content: space-between; - height: 46px; + height: 60px; background-color: #fff; border-bottom: 1px solid #dedede; -} +<<<<<<< HEAD // 内容标题左侧样式 .center-left-but { display: flex; @@ -71,6 +75,8 @@ .center-left-butDACT { background-color: #409eff; color: #fff; +======= +>>>>>>> 216e984... 上传我的成果静态页面 } .head-navigation { @@ -215,4 +221,26 @@ .ant-modal-footer{ text-align: center; } +<<<<<<< HEAD >>>>>>> 92f3934... 上传我的需求及 +======= + + +@media screen and (max-width: 1200px){ + .centerbox { + width: 100vw; + } + .newHeaders{ + min-width: 325px; + } + .newContainers{ + min-width: 325px; + .newMain{ + min-width: 325px; + } + } + .newFooter{ + min-width: 325px; + } +} +>>>>>>> 216e984... 上传我的成果静态页面 diff --git a/src/military/task/myTask/index.jsx b/src/military/task/myTask/index.jsx index 484bb59c..e6e99de4 100644 --- a/src/military/task/myTask/index.jsx +++ b/src/military/task/myTask/index.jsx @@ -1,8 +1,9 @@ import React, { useEffect, useState } from 'react'; -import { Tabs, Input, Button, } from 'antd'; +import { Tabs, Input, Button,Table,Pagination } from 'antd'; import StatusNav from '../../components/statusNav'; +import ChooseNav from '../../components/chooseNav'; import ItemListMyTask from '../../components/itemListMyTask'; -import { taskStatusAllArr, } from '../static'; +import { taskStatusAllArr, applyStatusArr } from '../static'; import { getTaskList, getTaskCategory } from '../api'; import './index.scss'; const Search = Input.Search; @@ -11,6 +12,7 @@ const { TabPane } = Tabs; const publishStatusArr = taskStatusAllArr.slice(3); const unpublishStatusArr = taskStatusAllArr.slice(0, 3); +const columns=[]; export default ({ location, history, current_user }) => { let defaultValue = decodeURI(location.search.split("=")[1] || ""); @@ -25,6 +27,8 @@ export default ({ location, history, current_user }) => { return defaultValue === 'false' ? '0,1,2' : '3,4,5,6,7,8'; }); + const [requireAchieve, setRequireAchieve] = useState('1'); + const [searchInput, setSearchInput] = useState(''); const [orderBy, setOrderBy] = useState(''); const [curPage, setCurPage] = useState(1); @@ -81,6 +85,16 @@ export default ({ location, history, current_user }) => { setCurPage(1); } + function changeIdentity(key) { + setIdentity(key); + if (key === '1') { + setStatusString('3,4,5,6,7,8'); + } else { + setStatusString('0,1,2'); + } + setCurPage(1); + } + function changeStatusType(key) { if (key === '1') { setStatusString('3,4,5,6,7,8'); @@ -91,10 +105,21 @@ export default ({ location, history, current_user }) => { setStatusType(key); } + function changeRequireAchieve(key) { + if (key === '1') { + setStatusString('3,4,5,6,7,8'); + } else { + setStatusString('0,1,2'); + } + setCurPage(1); + setRequireAchieve(key); + } + return (
    - { setIdentity(key) }}> + + { /> + - 请稍候 + + setSearchInput(value)} + /> + } + > + + + + + + { setCurPage(page) }} + loading={loading} + /> + + + + + +
    row.id} + dataSource={taskList} + columns={columns} + pagination={false} + /> + {taskList.length > 10 && + { setCurPage(page) }} + current={curPage} + total={total} + />} + + + diff --git a/src/military/task/static.js b/src/military/task/static.js index 83893f4d..51074db8 100644 --- a/src/military/task/static.js +++ b/src/military/task/static.js @@ -52,7 +52,11 @@ export const sortArr = [{ desc: false, },]; - +export const applyStatusArr = [ + { dicItemCode: '0', name: "待确认", dicItemName: '待确认' }, + { dicItemCode: '1', name: "未采纳", dicItemName: '未采纳' }, + { dicItemCode: '2', name: "评选胜出", dicItemName: '评选胜出' }, +]; export const formItemLayout = { labelCol: { diff --git a/src/military/task/taskDetail/index.jsx b/src/military/task/taskDetail/index.jsx index 5ba31038..cd5e260f 100644 --- a/src/military/task/taskDetail/index.jsx +++ b/src/military/task/taskDetail/index.jsx @@ -1,69 +1,164 @@ -import React, { useEffect, useState, useCallback } from 'react'; +import React, { forwardRef, useEffect, useState, useCallback } from 'react'; +import { Form, Input, Button, Modal, Table, Pagination } from 'antd'; +import classNames from 'classnames'; import { Link } from "react-router-dom"; import { getImageUrl } from 'educoder'; -import { httpUrl } from '../../fetch'; +import Upload from '../../components/Upload'; +import StatusNav from '../../components/statusNav'; +import ItemListAchieve from '../../components/itemListAchieve'; import { getTaskDetail, getTaskCategory } from '../api'; -import { taskModeIdArr} from '../static'; -import './index.scss'; -import classNames from 'classnames'; +import { taskModeIdArr, applyStatusArr } from '../static'; +import { httpUrl } from '../../fetch'; -const taskModeNameArr=[]; -for(const item of taskModeIdArr){ - taskModeNameArr[item.dicItemCode]=item.dicItemName; +import winpng from '../../image/win.png'; + +import './index.scss'; +const { TextArea } = Input; + +const taskModeNameArr = []; +for (const item of taskModeIdArr) { + taskModeNameArr[item.dicItemCode] = item.dicItemName; } -export default ({ match, current_user, history, showNotification }) => { - console.log(current_user); - const id = match.params.taskId; - const [detailData, setDetailData] = useState({}); - const [taskCategoryValueArr, setTaskCategoryValueArr] = useState([]); +const columns = [ + { + title: '应征者姓名', + dataIndex: 'name', + }, + { + title: '投稿时间', + dataIndex: 'age', + }, + { + title: '状态', + dataIndex: 'status', + render:(text,record)=>{ + return + } + + }, + { + title: '详情', + dataIndex: 'detail', + }, +]; + +export default Form.create()( + forwardRef(({ match, current_user, form, history, showNotification }, ref) => { + console.log(current_user); + const id = match.params.taskId; + const { getFieldDecorator, validateFields, setFieldsValue } = form; + + const [detailData, setDetailData] = useState({}); + const [taskCategoryValueArr, setTaskCategoryValueArr] = useState([]); + const [fileList, setFileList] = useState(null); + + const [applyModal, setApplyModal] = useState(false); - // 获取任务领域数组 - useEffect(() => { - getTaskCategory().then(data => { - if (data) { - const taskCategoryValueArr = []; - for (const item of data) { - taskCategoryValueArr[item.id] = item.name; + const [curPage, setCurPage] = useState(1); + const [total, setTotal] = useState(0); + const [orderBy, setOrderBy] = useState(''); + const [dataList, setDataList] = useState([ + {name:'测试方式',id:1}, + {name:'测试方式',id:2}, + {name:'测试方式',id:3}, + {name:'测试方式',id:4}, + ]); + const [loading, setLoading] = useState(false); + + + // 获取任务领域数组 + useEffect(() => { + getTaskCategory().then(data => { + if (data) { + const taskCategoryValueArr = []; + for (const item of data) { + taskCategoryValueArr[item.id] = item.name; + } + setTaskCategoryValueArr(taskCategoryValueArr); } - setTaskCategoryValueArr(taskCategoryValueArr); - } - }); - }, []); + }); + }, []); - useEffect(() => { - id && getTaskDetail(id).then(data => { - setDetailData(data || {}); - console.log(data); - }) - }, [id]); - const process = useCallback((title, days, active) => { - return ( -
  • - {title} - {days &&

    - {days}天 + + useEffect(() => { + id && getTaskDetail(id).then(data => { + setDetailData(data || {}); + console.log(data); + }) + }, [id]); + + // 流程步骤显示 + const process = useCallback((title, days, active) => { + return ( +

  • + {title} + {days &&

    + {days}天

    } -
    • - ) - }, []); + + ) + }, []); - function downFile(item) { - let url = httpUrl + '/busiAttachments/download/' + item.id; - window.open(url); - } + function downFile(item) { + let url = httpUrl + '/busiAttachments/download/' + item.id; + window.open(url); + } - return ( - + + const helper = useCallback( + (label, name, rules, widget) => ( + + {getFieldDecorator(name, { rules, validateFirst: true })(widget)} + + ), + [] + ); + + + // 上传附件后得到的文件数组 + function UploadFunc(fileList) { + setFileList(fileList); + let files = []; + for (const item of fileList) { + files.push(item.id || item.response.data.id); + } + setFieldsValue({ + uploadFileNumbers: files.join() + }); + } + + + // 提交成果 + function saveItem(status) { + validateFields((error, values) => { + if (!error) { + + } + }) + } + + function changeOptionId(option, type) { + // if (type === 'publishStatus') { + // // setStatusString(option.dicItemCode.toString() || '3,4,5,6,7,8'); + // } else if (type === 'unpublishStatus') { + // // setStatusString(option.dicItemCode.toString() || '0,1,2'); + // } + // setCurPage(1); + } + + + + return (
    创客空间 > 任务大厅 > -  任务编号：{detailData.number} +  任务编号：{detailData.number}
    @@ -123,9 +218,9 @@ export default ({ match, current_user, history, showNotification }) => { { detailData.tasksAttachments.map(item => { return
    - + { downFile(item) }}> - {item.fileName} + {item.fileName} ({item.fileSizeString})
    }) @@ -136,7 +231,7 @@ export default ({ match, current_user, history, showNotification }) => {
    知识产权说明：

    1、参赛作品一经采用，其所有权、修改权和使用权均归主办方所有，设计者不得再在任何地方使用；
    - 2、应征者所提交的作品必须由应征者本人创作或参与创作，应征者应确认其作品的原创性，主办单位不承担因作品侵犯他人（或单位）的权利而产生的法律责任，其法律责任由应征者本人承担。 + 2、应征者所提交的作品必须由应征者本人创作或参与创作，应征者应确认其作品的原创性，主办单位不承担因作品侵犯他人（或单位）的权利而产生的法律责任，其法律责任由应征者本人承担。

    交稿声明：
    @@ -146,8 +241,176 @@ export default ({ match, current_user, history, showNotification }) => {

    -
    -     + {/* {detailData.status == '3' ? */} +
    + +
    - ) -} + {/* : */} +
    +
    我要应征投稿：
    + {helper( + "", + "achievementRemark", + [{ required: true, message: "请输入" }], + -
    - */} -
    +
    + { + item.paperDetail.busiAttachments && item.paperDetail.busiAttachments.map(fileItem => { + return
    + { downFile(fileItem) }}> + {fileItem.fileName} + ({fileItem.fileSizeString}) +
    + }) + } +
    + + {/* + */}
  • - 成果编号：#25698320 - 提交时间：2021-06-17 13: 45: 53 - 稿件状态：雇主已浏览 + 成果编号：#{item.number} + 提交时间：{item.createdAt} + 稿件状态：{item.read ? '雇主已浏览' : '雇主未浏览'} - 举报 - 0 - - 2 - + { setReportVisible(true); setCheckedItem(item) }}>举报 + { commentEdit(item.id) }}>0 + { thumbUp(item.id) }}>{item.thumbsUp}
    • -
    + + + { + setCommentHtml(html); + }} + /> + + +
    - - ) - }) - } - {list.length > 0 ? -
    - {total > pageSize && { setPage(page) }} - current={curPage} - total={total} - showTotal={total => `共 ${total} 条`} - />} -
    : - } - + ) + }) + } + + {list.length > 0 ? +
    + {total > pageSize && { setPage(page) }} + current={curPage} + total={total} + showTotal={total => `共 ${total} 条`} + />} +
    : + } + + } + + + { setReportVisible(false) }} + className="form-edit-modal" + > +
    +

    你的申诉信息将发送给平台管理员

    +

    请如实填写有效的申诉原由，我们将尽快完成审核

    +