issues非按钮复杂判断修改

2021-08-31 15:51:58 +08:00 · 2021-08-31 15:51:58 +08:00 · 4ccab2ed4f
parent 3f3299a3b8
commit 4ccab2ed4f
10 changed files with 152 additions and 12 deletions
--- a/.gitignore
+++ b/.gitignore
@ -86,3 +86,6 @@ typings/

 .DS_Store
 .idea/*
+
+package.json
+package-lock.json
--- a/package-lock.json
+++ b/package-lock.json
@ -264,6 +264,22 @@
        }
      }
    },
+    "@babel/runtime-corejs3": {
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz",
+      "integrity": "sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A==",
+      "requires": {
+        "core-js-pure": "^3.16.0",
+        "regenerator-runtime": "^0.13.4"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.13.9",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+          "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+        }
+      }
+    },
    "@babel/template": {
      "version": "7.14.5",
      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
@ -362,6 +378,18 @@
      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
    },
+    "@hot-loader/react-dom": {
+      "version": "16.14.0",
+      "resolved": "https://registry.npmjs.org/@hot-loader/react-dom/-/react-dom-16.14.0.tgz",
+      "integrity": "sha512-EN9czvcLsMYmSDo5yRKZOAq3ZGRlDpad1gPtX0NdMMomJXcPE3yFSeFzE94X/NjOaiSVimB7LuqPYpkWVaIi4Q==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.19.1"
+      }
+    },
    "@hypnosphi/create-react-context": {
      "version": "0.3.1",
      "resolved": "https://registry.npmjs.org/@hypnosphi/create-react-context/-/create-react-context-0.3.1.tgz",
@ -3909,6 +3937,11 @@
      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
    },
+    "core-js-pure": {
+      "version": "3.16.4",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.4.tgz",
+      "integrity": "sha512-bY1K3/1Jy9D8Jd12eoeVahNXHLfHFb4TXWI8SQ4y8bImR9qDPmGITBAfmcffTkgUvbJn87r8dILOTWW5kZzkgA=="
+    },
    "core-util-is": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@ -3990,6 +4023,58 @@
        "object-assign": "^4.1.1"
      }
    },
+    "cross-env": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.1"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
    "cross-spawn": {
      "version": "5.1.0",
      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@ -18975,6 +19060,51 @@
        "makeerror": "1.0.x"
      }
    },
+    "wangeditor": {
+      "version": "4.7.7",
+      "resolved": "https://registry.npmjs.org/wangeditor/-/wangeditor-4.7.7.tgz",
+      "integrity": "sha512-eUpgP7i4pCYIjxjGMMcSUtkHUCkdX7BBwLZE6umseoK9hs3qIMu1tQ95FG48NJwL71JyAjt5c1gB56PzducL3Q==",
+      "requires": {
+        "@babel/runtime": "^7.11.2",
+        "@babel/runtime-corejs3": "^7.11.2",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.15.3",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz",
+          "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.9",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+          "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+        }
+      }
+    },
+    "wangeditor-for-react": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/wangeditor-for-react/-/wangeditor-for-react-1.5.3.tgz",
+      "integrity": "sha512-nnfZW6leWrVP5UFLEl93UmquSxgfkMpRM45nRusuA/QA+OPIKh0+JW4ZSmSjpmolhT8//iyQOry1I5EuVFwgog==",
+      "requires": {
+        "react": "^17.0.2",
+        "wangeditor": "^4.7.5"
+      },
+      "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",
--- a/package.json
+++ b/package.json
@ -116,7 +116,7 @@
  },
  "scripts": {
    "start": "node --max_old_space_size=15360 scripts/start.js",
-    "build": "NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
+    "build": "cross-env NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
    "test-build": "NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
    "pre-build": "NODE_ENV=preBuild node --max_old_space_size=15360 scripts/build.js",
    "gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json",
@ -193,6 +193,7 @@
    "babel-preset-stage-2": "^6.24.1",
    "compression-webpack-plugin": "^1.1.12",
    "concat": "^1.0.3",
+    "cross-env": "^7.0.3",
    "happypack": "^5.0.1",
    "mockjs": "^1.1.0",
    "node-sass": "^4.12.0",
--- a/src/military/fetch.js
+++ b/src/military/fetch.js
@ -6,11 +6,11 @@ import cookie from 'react-cookies';
 let actionUrl = '';
 if (window.location.href.indexOf(':3007') > -1) {
  actionUrl = 'http://117.50.100.12:8008';
-  // actionUrl='http://192.168.31.72:8081'; //万佳后台
-} else if (window.location.href.indexOf('117.50.100.12') > -1) {
+  // actionUrl='http://192.168.31.74:8081'; //万佳后台
+} else if (window.location.href.indexOf('117.50.100.12') > -1 ||window.location.href.indexOf('forgeweb.osredm') > -1) {
  actionUrl = "http://117.50.100.12:8008";  //测试环境
  axios.defaults.withCredentials = true;
-} else if (window.location.href.indexOf('osredm') > -1) {
+} else if (window.location.href.indexOf('forge.osredm') > -1) {
  actionUrl = "https://info.osredm.com";  //生产环境
  axios.defaults.withCredentials = true;
 }
--- a/src/military/task/components/adminRouter/index.jsx
+++ b/src/military/task/components/adminRouter/index.jsx
@ -26,7 +26,7 @@ export default props => {
      </SubMenu>
      <SubMenu title="代办事项" >
        <Menu.Item><a href={`/task/delayManage`}>延期任务处理</a></Menu.Item>
-        <Menu.Item><a href={`${main_web_site_url}/admin/industries/audit_files`}>协议签订凭证上传</a></Menu.Item>
+        <Menu.Item><a href={`${main_web_site_url}/admin/audit_files`}>协议签订凭证上传</a></Menu.Item>
        <Menu.Item><a href="/task/payProof">支付报酬凭证上传</a></Menu.Item>
      </SubMenu>

--- a/src/military/task/components/itemListPaper/index.jsx
+++ b/src/military/task/components/itemListPaper/index.jsx
@ -152,7 +152,7 @@ export default Form.create()((props) => {
                  <div className="flex1">
                    <ul>
                      <li className="fl pr">
-                        <span className="user-box font-16 mr20 color-grey3" onClick={() => { goUser(item.user.login) }}>
+                        <span className={item.user.nickname === "******" ? "font-16 mr20 color-grey3":"user-box font-16 mr20 color-grey3 clickable"} onClick={() => { item.user.nickname === "******" ? "" : goUser(item.user.login) }}>
                          {item.user.nickname || item.user.login}
                        </span>
                        <span className="color-grey9">{timeAgo(item.createdAt)}</span>
--- a/src/military/task/components/itemListPaper/index.scss
+++ b/src/military/task/components/itemListPaper/index.scss
@ -38,4 +38,9 @@

 .small-head{
  max-width: 2rem;
+}
+
+.clickable:hover{
+  color: #4cacff;
+  cursor: pointer;
 }
--- a/src/military/task/components/itemPublicityComplain/index.scss
+++ b/src/military/task/components/itemPublicityComplain/index.scss
@ -17,9 +17,9 @@ a.primary-link {

 .infos_item {
  float: left;
-  max-width: 273px;
+  max-width: 90%;
  overflow: hidden;
-  white-space: nowrap;
+  // white-space: nowrap;
  text-overflow: ellipsis;
  color: #343434;
  margin-right: 6px;
--- a/src/military/task/paperManage/index.jsx
+++ b/src/military/task/paperManage/index.jsx
@ -297,7 +297,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his
        title="不通过的原因"
        visible={visible}
        onOk={() => { checkPaperItem(activeId, false) }}
-        onCancel={() => { setVisible(false) }}
+        onCancel={() => { setVisible(false); setFieldsValue({ pass: 2, message: '' }); }}
        className="form-edit-modal"
      >
        {helper(
@ -309,7 +309,8 @@ export default Form.create()(({ current_user, form, showNotification, match, his
          >
            <Radio value={2}>允许申诉</Radio>
            <Radio value={0}>不允许申诉</Radio>
-          </Radio.Group>
+          </Radio.Group>,
+          2
        )
        }

--- a/src/military/task/taskDetail/index.jsx
+++ b/src/military/task/taskDetail/index.jsx
@ -275,7 +275,7 @@ export default Form.create()(
    }

    const reloadList = useCallback(() => {
-      setRelaodChildList(relaodChildList + 1);
+      setRelaodChildList(Math.random());
    });

    const reloadDetail = useCallback(() => {
@ -379,7 +379,7 @@ export default Form.create()(
          {
            detailData.status === 5 &&
            <p className="color-orange mb10 task_tip fl">
-              <i className="iconfont icon-laba fl mr5 color-orange font-15"></i>该需求已选稿，作品公示期为{detailData.makePublicDays}天接受监督和举报，于{backPublicEnd(detailData.makePublicAt, detailData.makePublicDays)}公示期满后支付赏金
+              <i className="iconfont icon-laba fl mr5 color-orange font-15"></i>该任务已选稿，作品公示期为{detailData.makePublicDays}天接受监督和举报，于{backPublicEnd(detailData.makePublicAt, detailData.makePublicDays)}公示期满后签订协议
            </p>}

          <div className="clearfix tasks_status_father mb30" style={{ background: "#FAFAFA" }}>