任务模块

10 months ago · b2652f3a04
parent 50780953a3
commit b2652f3a04
25 changed files with 1473 additions and 151 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -2698,6 +2698,17 @@
            "unique-filename": "^1.1.1"
          }
        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
        "cliui": {
          "version": "6.0.0",
          "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-6.0.0.tgz?cache=0&sync_timestamp=1604880017635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-6.0.0.tgz",
@ -2749,6 +2760,18 @@
            "supports-color": "^7.0.0"
          }
        },
+        "loader-utils": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
        "ms": {
          "version": "2.1.2",
          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz?cache=0&sync_timestamp=1607433856030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.2.tgz",
@ -2806,6 +2829,18 @@
            "webpack-sources": "^1.4.3"
          }
        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.8.3",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
+        },
        "wrap-ansi": {
          "version": "6.2.0",
          "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-6.2.0.tgz",
@ -17441,9 +17476,9 @@
      }
    },
    "vue-json-viewer": {
-      "version": "2.2.21",
-      "resolved": "https://registry.npmmirror.com/vue-json-viewer/download/vue-json-viewer-2.2.21.tgz",
-      "integrity": "sha512-FZL5pZM63nJjAWqOIkiA9KtAesIhUwmFkAaBZ4eCIPb0jDczL59bHgbdJOkvP7rsFVuQox5SHAxj7O7SrJrTvw==",
+      "version": "2.2.22",
+      "resolved": "https://registry.npmmirror.com/vue-json-viewer/-/vue-json-viewer-2.2.22.tgz",
+      "integrity": "sha512-3oPH5BxoUWva/qp7wNJj+15FBXyi9Yu5VDW4mCWivjHR1pUpMv34fjqqxML7jh2uOqm1S/3Xks5nQ5JjC5+OWw==",
      "requires": {
        "clipboard": "^2.0.4"
      }
@ -17469,87 +17504,6 @@
        }
      }
    },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.8.3",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
-      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
    "vue-ls": {
      "version": "3.2.2",
      "resolved": "https://registry.npm.taobao.org/vue-ls/download/vue-ls-3.2.2.tgz",
--- a/package.json
+++ b/package.json
@ -54,7 +54,7 @@
    "vue-contextmenu": "^1.5.9",
    "vue-cropper": "0.4.9",
    "vue-easytable": "^2.27.1",
-    "vue-json-viewer": "^2.2.1",
+    "vue-json-viewer": "^2.2.22",
    "vue-ls": "^3.2.1",
    "vue-quill-editor": "^3.0.6",
    "vue-router": "^3.1.2",
--- a/src/api/modular/main/TaskmanageList.js
+++ b/src/api/modular/main/TaskmanageList.js
@ -342,3 +342,58 @@ export function TaskManageBCGetCompareResult(parameter) {
    params: parameter
  })
 }
+export function TaskManageRollingNominationGetInfoByTaskId(parameter) {
+  return axios({
+    url: '/TaskManageRollingNomination/GetInfoByTaskId',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function GetLoadStatusDetailList(parameter) {
+  return axios({
+    url: '/TaskManageRollingNomination/GetLoadStatusDetailList',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function RefreshBookingorder(parameter) {
+  return axios({
+    url: '/TaskManageRollingNomination/RefreshBookingorder',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function TaskManageRolingWominationGetUrl(parameter) {
+  return axios({
+    url: '/TaskManageRollingNomination/GetUrl',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function TaskManageRolingWominationCancelsharelink(parameter) {
+  return axios({
+    url: '/TaskManageRollingNomination/Cancelsharelink',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function DispatchRollingNomination(parameter) {
+  return axios({
+    url: '/TaskManageRollingNomination/DispatchRollingNomination',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function CreateShareLink(parameter) {
+  return axios({
+    url: '/TaskManageRollingNomination/CreateShareLink',
+    method: 'post',
+    data: parameter
+  })
+}
--- a/src/api/modular/system/logManage.js
+++ b/src/api/modular/system/logManage.js
@ -14,7 +14,7 @@ import { axios } from '@/utils/request'
 * @author yubaoshan
 * @date 2020/5/19 11:57
 */
-export function sysVisLogPage (parameter) {
+export function sysVisLogPage(parameter) {
  return axios({
    url: '/sysVisLog/page',
    method: 'get',
@ -28,7 +28,7 @@ export function sysVisLogPage (parameter) {
 * @author yubaoshan
 * @date 2020/5/19 11:57
 */
-export function sysOpLogPage (parameter) {
+export function sysOpLogPage(parameter) {
  return axios({
    url: '/sysOpLog/page',
    method: 'get',
@ -42,7 +42,7 @@ export function sysOpLogPage (parameter) {
 * @author yubaoshan
 * @date 2020/5/19 11:57
 */
-export function sysExLogPage (parameter) {
+export function sysExLogPage(parameter) {
  return axios({
    url: '/sysExLog/page',
    method: 'get',
@ -56,7 +56,7 @@ export function sysExLogPage (parameter) {
 * @author yubaoshan
 * @date 2020/6/23 23:09
 */
-export function sysVisLogDelete (parameter) {
+export function sysVisLogDelete(parameter) {
  return axios({
    url: '/sysVisLog/delete',
    method: 'post',
@ -70,7 +70,7 @@ export function sysVisLogDelete (parameter) {
 * @author yubaoshan
 * @date 2020/6/23 23:09
 */
-export function sysOpLogDelete (parameter) {
+export function sysOpLogDelete(parameter) {
  return axios({
    url: '/sysOpLog/delete',
    method: 'post',
@ -84,10 +84,18 @@ export function sysOpLogDelete (parameter) {
 * @author yubaoshan
 * @date 2020/6/23 23:09
 */
- export function sysExLogDelete (parameter) {
+export function sysExLogDelete(parameter) {
  return axios({
    url: '/sysExLog/delete',
    method: 'post',
    data: parameter
  })
 }
+
+export function sysOpLogdetail(parameter) {
+  return axios({
+    url: '/sysOpLog/detail',
+    method: 'get',
+    params: parameter
+  })
+}
--- a/src/assets/icons/u1041.svg
+++ b/src/assets/icons/u1041.svg
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="14px" height="14px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -8 -10 )">
+    <path d="M 7.351562499999999 2.372747747747747  C 7.450520833333334 2.272897897897897  7.500000000000002 2.154654654654654  7.5 2.018018018018018  C 7.500000000000002 1.8813813813813798  7.450520833333334 1.7631381381381366  7.351562499999999 1.663288288288288  C 7.252604166666667 1.5634384384384379  7.135416666666667 1.5135135135135136  7 1.5135135135135136  C 6.864583333333334 1.5135135135135136  6.747395833333334 1.5634384384384379  6.6484375 1.663288288288288  C 6.549479166666667 1.7631381381381366  6.5 1.8813813813813798  6.5 2.018018018018018  C 6.5 2.154654654654654  6.549479166666667 2.272897897897897  6.6484375 2.372747747747747  C 6.747395833333334 2.472597597597596  6.864583333333334 2.5225225225225234  7 2.5225225225225234  C 7.135416666666667 2.5225225225225234  7.252604166666667 2.472597597597596  7.351562499999999 2.372747747747747  Z M 13.9296875 9.152027027027028  C 13.9765625 9.199324324324323  14 9.25975975975976  14 9.333333333333334  L 14 12.108108108108109  C 14 12.223723723723724  13.947916666666668 12.302552552552552  13.84375 12.344594594594595  C 13.802083333333336 12.355105105105105  13.770833333333336 12.36036036036036  13.75 12.36036036036036  C 13.6875 12.36036036036036  13.627604166666668 12.336711711711711  13.5703125 12.289414414414415  L 12.84375 11.556306306306308  C 12.223958333333334 12.307807807807807  11.39453125 12.902965465465465  10.35546875 13.34177927927928  C 9.31640625 13.780593093093094  8.197916666666668 14  7 14  C 5.802083333333334 14  4.68359375 13.780593093093094  3.64453125 13.34177927927928  C 2.60546875 12.902965465465465  1.776041666666667 12.307807807807807  1.15625 11.556306306306308  L 0.4296875 12.289414414414415  C 0.3828125 12.336711711711711  0.3229166666666667 12.36036036036036  0.25 12.36036036036036  C 0.22916666666666669 12.36036036036036  0.19791666666666669 12.355105105105105  0.15625 12.344594594594595  C 0.05208333333333333 12.302552552552552  0 12.223723723723724  0 12.108108108108109  L 0 9.333333333333334  C 0 9.25975975975976  0.0234375 9.199324324324323  0.0703125 9.152027027027028  C 0.11718750000000003 9.10472972972973  0.17708333333333334 9.08108108108108  0.25 9.08108108108108  L 3 9.08108108108108  C 3.1145833333333335 9.08108108108108  3.1927083333333335 9.133633633633634  3.234375 9.23873873873874  C 3.276041666666667 9.338588588588587  3.2578125 9.430555555555555  3.1796875 9.51463963963964  L 2.3984375 10.302927927927929  C 2.7473958333333335 10.781156156156158  3.240885416666667 11.184496996996996  3.87890625 11.51295045045045  C 4.516927083333334 11.841403903903904  5.223958333333334 12.058183183183182  6 12.163288288288289  L 6 7.063063063063062  L 4.5 7.063063063063062  C 4.364583333333334 7.063063063063062  4.247395833333334 7.013138138138138  4.1484375 6.913288288288288  C 4.049479166666667 6.813438438438438  4 6.695195195195195  4 6.558558558558558  L 4 5.549549549549549  C 4 5.412912912912911  4.049479166666667 5.294669669669668  4.1484375 5.194819819819819  C 4.247395833333334 5.094969969969969  4.364583333333334 5.045045045045045  4.5 5.045045045045045  L 6 5.045045045045045  L 6 3.760135135135134  C 5.697916666666667 3.5814564564564555  5.455729166666667 3.3384009009009006  5.2734375 3.030968468468469  C 5.091145833333334 2.7235360360360366  5 2.3858858858858856  5 2.018018018018018  C 5 1.460960960960961  5.1953125 0.98536036036036  5.5859375 0.591216216216216  C 5.9765625 0.197072072072072  6.447916666666667 0  7 0  C 7.552083333333334 0  8.0234375 0.197072072072072  8.4140625 0.591216216216216  C 8.8046875 0.98536036036036  9 1.460960960960961  9 2.018018018018018  C 9 2.3858858858858856  8.908854166666668 2.7235360360360366  8.7265625 3.030968468468469  C 8.544270833333334 3.3384009009009006  8.302083333333334 3.5814564564564555  8 3.760135135135134  L 8 5.045045045045045  L 9.5 5.045045045045045  C 9.635416666666668 5.045045045045045  9.752604166666668 5.094969969969969  9.8515625 5.194819819819819  C 9.950520833333334 5.294669669669668  10 5.412912912912911  10 5.549549549549549  L 10 6.558558558558558  C 10 6.695195195195195  9.950520833333334 6.813438438438438  9.8515625 6.913288288288288  C 9.752604166666668 7.013138138138138  9.635416666666668 7.063063063063062  9.5 7.063063063063062  L 8 7.063063063063062  L 8 12.163288288288289  C 8.776041666666668 12.058183183183182  9.483072916666668 11.841403903903904  10.12109375 11.51295045045045  C 10.759114583333334 11.184496996996996  11.252604166666668 10.781156156156158  11.6015625 10.302927927927929  L 10.8203125 9.51463963963964  C 10.7421875 9.430555555555555  10.723958333333334 9.338588588588587  10.765625 9.23873873873874  C 10.807291666666668 9.133633633633634  10.885416666666668 9.08108108108108  11 9.08108108108108  L 13.75 9.08108108108108  C 13.822916666666668 9.08108108108108  13.8828125 9.10472972972973  13.9296875 9.152027027027028  Z " fill-rule="nonzero" fill="#02a7f0" stroke="none" transform="matrix(1 0 0 1 8 10 )" />
+  </g>
+</svg>
--- a/src/assets/icons/u1043.svg
+++ b/src/assets/icons/u1043.svg
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="14px" height="14px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -34 -37 )">
+    <path d="M 1.7702546296296298 0.341796875  C 1.972800925925926 0.5696614583333328  2.074074074074074 0.8446180555555547  2.074074074074074 1.1666666666666672  C 2.074074074074074 1.6041666666666672  1.9012345679012348 1.9383680555555547  1.5555555555555554 2.169270833333333  L 1.5555555555555554 13.708333333333332  C 1.5555555555555554 13.78732638888889  1.5298996913580247 13.85568576388889  1.478587962962963 13.913411458333332  C 1.4272762345679015 13.971137152777777  1.3665123456790127 14  1.2962962962962963 14  L 0.7777777777777777 14  C 0.7075617283950617 14  0.6467978395061729 13.971137152777777  0.5954861111111112 13.913411458333332  C 0.5441743827160496 13.85568576388889  0.5185185185185185 13.78732638888889  0.5185185185185185 13.708333333333332  L 0.5185185185185185 2.169270833333333  C 0.1728395061728396 1.9383680555555547  0 1.6041666666666672  0 1.1666666666666672  C 0 0.8446180555555547  0.10127314814814815 0.5696614583333328  0.3038194444444444 0.341796875  C 0.5063657407407407 0.11393229166666718  0.7507716049382718 0  1.037037037037037 0  C 1.3233024691358026 0  1.5677083333333335 0.11393229166666718  1.7702546296296298 0.341796875  Z M 13.846064814814815 1.33984375  C 13.94868827160494 1.4552951388888875  14 1.5920138888888875  14 1.75  L 14 8.704427083333334  C 14 8.856336805555554  13.966242283950619 8.973307291666666  13.898726851851851 9.055338541666666  C 13.831211419753089 9.137369791666666  13.724537037037038 9.220920138888888  13.578703703703704 9.305989583333334  C 12.41743827160494 10.010850694444443  11.420910493827162 10.36328125  10.58912037037037 10.36328125  C 10.259645061728396 10.36328125  9.926118827160494 10.296440972222221  9.588541666666668 10.162760416666666  C 9.25096450617284 10.029079861111109  8.957947530864198 9.883246527777779  8.70949074074074 9.725260416666666  C 8.461033950617285 9.567274305555554  8.149112654320987 9.421440972222221  7.773726851851852 9.287760416666666  C 7.398341049382716 9.154079861111109  7.013503086419753 9.087239583333334  6.619212962962963 9.087239583333334  C 5.582175925925926 9.087239583333334  4.329089506172839 9.530815972222221  2.8599537037037037 10.41796875  C 2.768132716049383 10.47265625  2.6790123456790127 10.5  2.5925925925925926 10.5  C 2.4521604938271606 10.5  2.330632716049383 10.442274305555554  2.228009259259259 10.326822916666666  C 2.125385802469136 10.211371527777779  2.074074074074074 10.074652777777779  2.074074074074074 9.916666666666666  L 2.074074074074074 3.153645833333333  C 2.074074074074074 2.9592013888888875  2.1577932098765435 2.7921006944444438  2.3252314814814814 2.65234375  C 2.4386574074074074 2.5672743055555545  2.6520061728395063 2.4366319444444438  2.9652777777777777 2.260416666666667  C 4.23996913580247 1.53125  5.37692901234568 1.1666666666666672  6.376157407407407 1.1666666666666672  C 6.954089506172839 1.1666666666666672  7.494212962962963 1.2547743055555547  7.996527777777779 1.4309895833333328  C 8.498842592592593 1.607204861111111  9.090277777777779 1.8745659722222203  9.770833333333332 2.233072916666667  C 9.97608024691358 2.3485243055555545  10.213734567901236 2.40625  10.483796296296296 2.40625  C 10.775462962962964 2.40625  11.092785493827162 2.342447916666667  11.43576388888889 2.21484375  C 11.778742283950619 2.087239583333333  12.075810185185187 1.9444444444444438  12.326967592592593 1.7864583333333328  C 12.578125000000002 1.6284722222222203  12.815779320987655 1.4856770833333328  13.039930555555557 1.3580729166666672  C 13.264081790123457 1.23046875  13.411265432098766 1.1666666666666672  13.481481481481481 1.1666666666666672  C 13.621913580246915 1.1666666666666672  13.743441358024693 1.224392361111111  13.846064814814815 1.33984375  Z " fill-rule="nonzero" fill="#f59a23" stroke="none" transform="matrix(1 0 0 1 34 37 )" />
+  </g>
+</svg>
--- a/src/assets/icons/u1044.svg
+++ b/src/assets/icons/u1044.svg
--- a/src/assets/icons/u1046.svg
+++ b/src/assets/icons/u1046.svg
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="14px" height="14px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -34 -61 )">
+    <path d="M 1.26875 0  L 12.731250000000001 0  C 12.898958333333335 0  13.059375000000001 0.02775941837409146  13.2125 0.08327825512227438  C 13.453125 0.1634721304252018  13.64453125 0.2899317030182853  13.78671875 0.4626569729015202  C 13.928906249999999 0.6353822427847535  14 0.8266137915840484  14 1.0363516192994047  L 14 12.963648380700596  C 14 13.173386208415952  13.928906249999999 13.364617757215244  13.78671875 13.53734302709848  C 13.64453125 13.710068296981715  13.453125 13.836527869574795  13.2125 13.916721744877727  C 13.073958333333335 13.96607182198722  12.913541666666667 13.99074686054197  12.731250000000001 13.99074686054197  C 12.38125 13.99074686054197  12.078645833333335 13.892046706322978  11.823437499999999 13.694646397884997  L 7 9.771315267680105  L 2.1765624999999997 13.694646397884997  C 1.9140625 13.898215465961666  1.6114583333333334 14  1.26875 14  C 1.1010416666666667 14  0.9406249999999999 13.972240581625908  0.7875 13.916721744877727  C 0.546875 13.836527869574795  0.35546875 13.710068296981715  0.21328125 13.53734302709848  C 0.07109375 13.364617757215244  0 13.173386208415952  0 12.963648380700596  L 0 1.0363516192994047  C 0 0.8266137915840484  0.07109375 0.6353822427847535  0.21328125 0.4626569729015202  C 0.35546875 0.2899317030182853  0.546875 0.1634721304252018  0.7875 0.08327825512227438  C 0.9406249999999999 0.02775941837409146  1.1010416666666667 0  1.26875 0  Z " fill-rule="nonzero" fill="#aaaa00" stroke="none" transform="matrix(1 0 0 1 34 61 )" />
+  </g>
+</svg>
--- a/src/assets/icons/u1133.svg
+++ b/src/assets/icons/u1133.svg
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="20px" height="20px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -85 -532 )">
+    <path d="M 10.769230769230768 9.002403846153847  L 10.769230769230768 18.040865384615387  L 18.461538461538463 13.846153846153847  L 18.461538461538463 6.201923076923077  L 10.769230769230768 9.002403846153847  Z M 1.6105769230769231 4.591346153846154  L 10 7.644230769230768  L 18.389423076923077 4.591346153846154  L 10 1.5384615384615374  L 1.6105769230769231 4.591346153846154  Z M 19.723557692307693 3.7379807692307687  C 19.907852564102566 4.002403846153846  20 4.294871794871793  20 4.615384615384615  L 20 13.846153846153847  C 20 14.126602564102564  19.927884615384613 14.387019230769232  19.783653846153847 14.627403846153847  C 19.639423076923077 14.867788461538463  19.443108974358974 15.056089743589745  19.194711538461537 15.192307692307692  L 10.733173076923077 19.807692307692307  C 10.508814102564104 19.935897435897438  10.264423076923077 20  10 20  C 9.735576923076923 20  9.491185897435898 19.935897435897438  9.266826923076923 19.807692307692307  L 0.8052884615384616 15.192307692307692  C 0.5568910256410257 15.056089743589745  0.36057692307692313 14.867788461538463  0.21634615384615385 14.627403846153847  C 0.07211538461538462 14.387019230769232  0 14.126602564102564  0 13.846153846153847  L 0 4.615384615384615  C 0 4.294871794871793  0.09214743589743588 4.002403846153846  0.2764423076923077 3.7379807692307687  C 0.4607371794871795 3.4735576923076916  0.7051282051282051 3.2852564102564097  1.0096153846153846 3.173076923076923  L 9.471153846153847 0.09615384615384581  C 9.647435897435898 0.03205128205127972  9.82371794871795 0  10 0  C 10.176282051282053 0  10.352564102564104 0.03205128205127972  10.528846153846153 0.09615384615384581  L 18.990384615384613 3.173076923076923  C 19.294871794871796 3.2852564102564097  19.53926282051282 3.4735576923076916  19.723557692307693 3.7379807692307687  Z " fill-rule="nonzero" fill="#8400ff" stroke="none" transform="matrix(1 0 0 1 85 532 )" />
+  </g>
+</svg>
--- a/src/assets/icons/u1224.svg
+++ b/src/assets/icons/u1224.svg
--- a/src/assets/icons/u991.svg
+++ b/src/assets/icons/u991.svg
--- a/src/assets/icons/u993.svg
+++ b/src/assets/icons/u993.svg
--- a/src/assets/icons/u995.svg
+++ b/src/assets/icons/u995.svg
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="20px" height="20px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -85 -313 )">
+    <path d="M 10.769230769230768 9.002403846153847  L 10.769230769230768 18.040865384615387  L 18.461538461538463 13.846153846153847  L 18.461538461538463 6.201923076923077  L 10.769230769230768 9.002403846153847  Z M 1.6105769230769231 4.591346153846154  L 10 7.644230769230768  L 18.389423076923077 4.591346153846154  L 10 1.5384615384615374  L 1.6105769230769231 4.591346153846154  Z M 19.723557692307693 3.7379807692307687  C 19.907852564102566 4.002403846153846  20 4.294871794871793  20 4.615384615384615  L 20 13.846153846153847  C 20 14.126602564102564  19.927884615384613 14.387019230769232  19.783653846153847 14.627403846153847  C 19.639423076923077 14.867788461538463  19.443108974358974 15.056089743589745  19.194711538461537 15.192307692307692  L 10.733173076923077 19.807692307692307  C 10.508814102564104 19.935897435897438  10.264423076923077 20  10 20  C 9.735576923076923 20  9.491185897435898 19.935897435897438  9.266826923076923 19.807692307692307  L 0.8052884615384616 15.192307692307692  C 0.5568910256410257 15.056089743589745  0.36057692307692313 14.867788461538463  0.21634615384615385 14.627403846153847  C 0.07211538461538462 14.387019230769232  0 14.126602564102564  0 13.846153846153847  L 0 4.615384615384615  C 0 4.294871794871793  0.09214743589743588 4.002403846153846  0.2764423076923077 3.7379807692307687  C 0.4607371794871795 3.4735576923076916  0.7051282051282051 3.2852564102564097  1.0096153846153846 3.173076923076923  L 9.471153846153847 0.09615384615384581  C 9.647435897435898 0.03205128205127972  9.82371794871795 0  10 0  C 10.176282051282053 0  10.352564102564104 0.03205128205127972  10.528846153846153 0.09615384615384581  L 18.990384615384613 3.173076923076923  C 19.294871794871796 3.2852564102564097  19.53926282051282 3.4735576923076916  19.723557692307693 3.7379807692307687  Z " fill-rule="nonzero" fill="#a36717" stroke="none" transform="matrix(1 0 0 1 85 313 )" />
+  </g>
+</svg>
--- a/src/components/Table/index.js
+++ b/src/components/Table/index.js
@ -187,6 +187,7 @@ export default {
     * @param {Object} sorter 排序条件
     */
    loadData(pagination, filters, sorter) {
+      console.log(pagination, filters, sorter)
      this.localLoading = true
      if (sorter) {
        this.sortObj = sorter
@ -219,7 +220,6 @@ export default {
          }
        }
      }
-      console.log(parameter)
      const result = this.data(parameter)
      // 对接自己的通用数据接口需要修改下方代码中的 r.pageNo, r.totalCount, r.data
      // eslint-disable-next-line
--- a/src/main.js
+++ b/src/main.js
@ -32,8 +32,8 @@ import VueEasytable from 'vue-easytable'
 import qs from 'qs'
 import '@/utils/drag'
 import VueClipBoard from 'vue-clipboard2'
-Vue.use(VueClipBoard)

+Vue.use(VueClipBoard)
 Vue.use(VXETable)
 Vue.use(VueContextMenu)
 Vue.use(vcolorpicker)
--- a/src/router/generator-routers.js
+++ b/src/router/generator-routers.js
@ -41,6 +41,7 @@ const constantRouterComponents = {
  BcFileDetail: () => import('@/views/main/Taskmanage/BcFileDetail'),
  BCModify: () => import('@/views/main/Taskmanage/BCModify/index'),
  cancellation: () => import('@/views/main/Taskmanage/cancellation/index'),
+  rollingNomination: () => import('@/views/main/Taskmanage/rollingNomination/index'),
  BcEditing: () => import('@/views/main/Taskmanage/BcFileDetail/Editing'),
  BookingDetailTest: () => import('@/views/main/BookingLedger/detail/BookingDetailTest'),
  BookingCustomerDetail: () => import('@/views/main/BookingCustomerLedger/detail')
@ -201,6 +202,17 @@ const userAccount = [
    },
    component: 'cancellation'
  },
+  {
+    name: 'rollingNomination',
+    path: '/commontaskmanage/rollingNomination',
+    pid: 0,
+    id: 183191,
+    meta: {
+      title: 'rollingNomination',
+      show: false
+    },
+    component: 'rollingNomination'
+  },
  {
    name: 'TaskmanageDetail',
    path: '/commontaskmanage/TaskmanageDetail',
--- a/src/views/main/BookingLedger/detail/index.vue
+++ b/src/views/main/BookingLedger/detail/index.vue
@ -110,11 +110,16 @@
                      isParent="parent"
                      @changeDetail="changeDetailFun"></ediMore>
                  </div>
-                  <div id="tab-content3" style="background: white;" class="tab-content" v-show="mainOrderActiveKey === '3-3'">
+                  <div
+                    id="tab-content3"
+                    style="background: white;"
+                    class="tab-content"
+                    v-show="mainOrderActiveKey === '3-3'">
                    <iframe
                      ref="iframe"
+                      @load="handleIframeLoad"
                      style="width: 100%;height: 1400px;"
-                      src="http://localhost:8080/#/index"
+                      src="http://60.209.125.238:35103/#/index"
                      frameborder="0"></iframe>
                  </div>
                </div>
@ -630,6 +635,51 @@ export default {
      // this.$refs.basicInfo.refresh()
      // this.$refs.goodsTable.tableData = data.data2
    },
+    handleIframeLoad() {
+      if (this.bookingDetails.id !== 0) {
+        const mapFrame = this.$refs['iframe']
+        const data = {
+          custno: this.bookingDetails.custno,
+          mblno: this.bookingDetails.mblno,
+          cntrtotal: this.bookingDetails.cntrtotal,
+          cbm: this.bookingDetails.cbm,
+          kgs: this.bookingDetails.kgs,
+          pkgs: this.bookingDetails.pkgs,
+          customername: this.bookingDetails.customername,
+          customerid: this.bookingDetails.customerid,
+          portdischarge: this.bookingDetails.portdischarge,
+          vessel: this.bookingDetails.vessel,
+          voyno: this.bookingDetails.voyno,
+          sale: this.bookingDetails.sale,
+          etd: this.bookingDetails.etd,
+          blfrt: this.bookingDetails.blfrt,
+          destination: this.bookingDetails.destination,
+          portload: this.bookingDetails.portload,
+          truckerid: this.bookingDetails.truckerid,
+          trucker: this.bookingDetails.trucker,
+          customser: this.bookingDetails.customser,
+          customserid: this.bookingDetails.customserid,
+          forwarder: this.bookingDetails.forwarder,
+          forwarderid: this.bookingDetails.forwarderid,
+          agentname: this.bookingDetails.agentname,
+          agentnameid: this.bookingDetails.agentnameid,
+          yard: this.bookingDetails.yard,
+          yardid: this.bookingDetails.yardid,
+          shipagency: this.bookingDetails.shipagency,
+          shipagencyid: this.bookingDetails.shipagencyid,
+          id: this.bookingDetails.id
+        }
+        if (this.feeShow) {
+          const iframeWin = mapFrame.contentWindow
+          iframeWin.postMessage(
+            {
+              token: localStorage.getItem('pro__Access-Token'),
+              data: data,
+              customerTypeList: this.$options.filters['dictData']('djy_cust_prop')
+            }, '*')
+        }
+      }
+    },
    sendMessageFY() {
      const mapFrame = this.$refs['iframe']
      const data = {
@ -666,11 +716,11 @@ export default {
      if (this.feeShow) {
        const iframeWin = mapFrame.contentWindow
        iframeWin.postMessage(
-        {
-          token: localStorage.getItem('pro__Access-Token'),
-          data: data,
-          customerTypeList: this.$options.filters['dictData']('djy_cust_prop')
-        }, '*')
+          {
+            token: localStorage.getItem('pro__Access-Token'),
+            data: data,
+            customerTypeList: this.$options.filters['dictData']('djy_cust_prop')
+          }, '*')
      }
    },
    ...mapActions(['setNeedSavePages', 'setBookingList', 'setBookingGridOptions', 'setInBookingDetailsSave', 'setSET_SAVEFLAG']),
@ -844,7 +894,7 @@ export default {
        }, 200)
        setTimeout(() => {
          const key = this.$route.fullPath
-          this.sendMessageFY()
+          // this.sendMessageFY()
          setTimeout(() => {
            const detailsChange = Object.keys(this.needSavePages).includes(key)
              ? !!this.needSavePages[key].details
@ -1183,6 +1233,9 @@ export default {
          this.$store.commit('SET_SAVETOPDOWN', false)
        })
    },
+    handleIframeunLoad() {
+      console.log(22222)
+    },
    setDeatilsFun(res, overSet = false) {
      if (!res.data.bookingEDIExt) {
        res.data.bookingEDIExt = bookingEDIExt
--- a/src/views/main/BookingLedger/detail/modules/rightContent.vue
+++ b/src/views/main/BookingLedger/detail/modules/rightContent.vue
@ -256,22 +256,22 @@
        </template>
        <div class="cargo-info">
          <div class="info-header">
-            <span>修改人</span>
-            <span>修改时间</span>
+            <span style="width: 35%;display: inline-block;">修改人</span>
+            <span style="width: 35%;display: inline-block;">修改时间</span>
+            <span style="width: 30%;display: inline-block;">功能模块</span>
          </div>
          <div v-for="(log, lindex) in details.log" :key="lindex">
            <div class="list">
              <span class="btn">{{ log.createdUserName }}</span>
-              <span class="btn">
+              <span class="btn" :title="log.createdTime">
                {{ log.createdTime }}
-                <!-- <span class="more"> -->
                <i
                  class="iconfont icon-xia more"
                  v-if="log.details.length > 0"
                  :class="!log.showMore ? 'hide' : 'show'"
                  @click="showLogMore(lindex)"></i>
-                <!-- </span> -->
              </span>
+              <span :title="log.fromFunc" class="btn">{{ log.fromFunc }}</span>
            </div>
            <div class="more-detail" v-if="log.details.length > 0 && log.showMore">
              <div class="detail-single" v-for="(child, cindex) in log.details" :key="cindex">
--- a/src/views/main/BookingLedger/detail/style/rightContent.less
+++ b/src/views/main/BookingLedger/detail/style/rightContent.less
@ -475,7 +475,6 @@
        span {
          display: inline-block;
          border: 1px solid #eee;
-          flex: 1;
          &:nth-of-type(1) {
            border-right: none;
          }
--- a/src/views/main/Taskmanage/TaskmanageList/index.vue
+++ b/src/views/main/Taskmanage/TaskmanageList/index.vue
@ -1482,6 +1482,9 @@ export default {
      } else if (data.taskType === 'CANCELLATION') {
        // Cancellation
        this.$router.push({ path: '/commontaskmanage/Cancellation', query: { taskPKId: data.pkId } })
+      } else if (data.taskType === 'ROLLING_NOMINATION') {
+        // ROLLING_NOMINATION
+        this.$router.push({ path: '/commontaskmanage/rollingNomination', query: { taskPKId: data.pkId } })
      } else {
        // 订舱详情查看
        this.$router.push({ path: '/commontaskmanage/BookingDetails', query: { taskPKId: data.pkId } })
--- a/src/views/main/Taskmanage/rollingNomination/index.vue
+++ b/src/views/main/Taskmanage/rollingNomination/index.vue
--- a/src/views/main/fee/feeExchange.vue
+++ b/src/views/main/fee/feeExchange.vue
@ -135,7 +135,12 @@
          <a-row>
            <a-col :span="8">
              <a-form-model-item label="本位币">
-                <a-input v-model="addForm.localCurr" />
+                <a-select v-model="addForm.localCurr" style="width: 100%">
+                  <a-select-option
+                    v-for="(item, index) in currencyList"
+                    :key="index"
+                    :value="item.codeName">{{ item.codeName }}</a-select-option>
+                </a-select>
              </a-form-model-item>
            </a-col>
            <a-col :span="8">
--- a/src/views/main/fee/feeUnits.vue
+++ b/src/views/main/fee/feeUnits.vue
@ -104,14 +104,21 @@
            </a-col>
            <a-col :span="12">
              <a-form-model-item label="标准">
-                <a-input v-model="addForm.unit" />
+                <a-select v-model="addForm.unit" style="width: 100%" >
+                  <a-select-option v-for="(item,index) in unitList" :key="index" :value="item.name">{{ item.name }}</a-select-option>
+                </a-select>
              </a-form-model-item>
            </a-col>
          </a-row>
          <a-row>
            <a-col :span="12">
              <a-form-model-item label="币别">
-                <a-input v-model="addForm.currency" />
+                <a-select v-model="addForm.currency" style="width: 100%">
+                  <a-select-option
+                    v-for="(item, index) in currencyList"
+                    :key="index"
+                    :value="item.codeName">{{ item.codeName }}</a-select-option>
+                </a-select>
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
@ -187,7 +194,9 @@ import {
  FeeCustTemplatePage,
  FeeCustTemplateSave,
  FeeCustTemplateDelete,
-  GetFeeCustomerList
+  GetFeeCustomerList,
+  FeeCurrencyList,
+    GetFeeUnitList
 } from '@/api/modular/main/mailSetting'
 import columnSetting from '@/components/tableColumnSetting'
 export default {
@ -202,7 +211,7 @@ export default {
      visible: false,
      loading: false,
      selectedRowKeys: [],
-      title:'',
+      title: '',
      againVisible: false,
      fileList: [],
      setVisible: false,
@ -307,18 +316,37 @@ export default {
        receiveServer: [{ required: true, message: '请输入收件服务器', trigger: 'change' }]
      },
      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
-      loadData: []
+      loadData: [],
+      unitList: [],
+      currencyList: []
    }
  },
  created() { },
  mounted() {
    this.FnGetData()
    this.customerTypeList = this.$options.filters['dictData']('djy_cust_prop')
+    this.getCurrency()
+    this.GetFeeUnit()
  },
  methods: {
    toggleAdvanced() {
      this.advanced = !this.advanced
    },
+    getCurrency() {
+        FeeCurrencyList().then(res => {
+            this.currencyList = res.data
+        })
+      },
+    GetFeeUnit() {
+            GetFeeUnitList().then(res => {
+                res.data.forEach((item, index) => {
+                    if (!item.name) {
+                        res.data.splice(index, 1)
+                    }
+                })
+                this.unitList = res.data
+            })
+        },
    onSelectChange(selectedRowKeys) {
      this.selectedRowKeys = selectedRowKeys;
    },
--- a/src/views/system/log/oplog/details.vue
+++ b/src/views/system/log/oplog/details.vue
@ -1,52 +1,49 @@
 <template>
  <a-modal title="日志详情" :width="900" :visible="visible" :confirmLoading="confirmLoading" @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form :model="form">
        <a-row :gutter="24">
-          <a-col :md="12" :sm="24">
-            <a-form-item label="方法名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['methodName']" />
-            </a-form-item>
-          </a-col>
          <a-col :md="12" :sm="24">
            <a-form-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['location']" />
+              <a-input v-model="form.location" />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :md="12" :sm="24">
            <a-form-item label="浏览器" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['browser']" />
+              <a-input v-model="form.browser" />
            </a-form-item>
          </a-col>
          <a-col :md="12" :sm="24">
            <a-form-item label="操作系统" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['os']" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :md="12" :sm="24">
-            <a-form-item label="类名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-textarea :rows="4" v-decorator="['className']" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="12" :sm="24">
-            <a-form-item label="具体消息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-textarea :rows="4" v-decorator="['message']" />
+              <a-input v-model="form.os" />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :md="12" :sm="24">
            <a-form-item label="请求参数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-textarea :rows="4" v-decorator="['param']" />
+              <!-- <json-viewer
+                :value="JSON.parse(form.param)"
+                :expand-depth="5"
+                boxed
+                sort
+                copyable
+              >
+              </json-viewer> -->
            </a-form-item>
          </a-col>
          <a-col :md="12" :sm="24">
            <a-form-item label="返回结果" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-textarea :rows="4" v-decorator="['result']" />
+              <!-- <json-viewer
+                :value="JSON.parse(form.result)"
+                :expand-depth="5"
+                boxed
+                sort
+                copyable
+              >
+              </json-viewer> -->
            </a-form-item>
          </a-col>
        </a-row>
@ -55,7 +52,9 @@
  </a-modal>
 </template>
 <script>
+import JsonViewer from 'vue-json-viewer'
  export default {
+    components: { JsonViewer },
    data() {
      return {
        labelCol: {
@ -76,7 +75,7 @@
        },
        visible: false,
        confirmLoading: false,
-        form: this.$form.createForm(this)
+        form: {}
      }
    },
    methods: {
@ -84,20 +83,10 @@
      details(record) {
        this.visible = true
        setTimeout(() => {
-          this.form.setFieldsValue({
-            location: record.location,
-            browser: record.browser,
-            os: record.os,
-            className: record.className,
-            methodName: record.methodName,
-            param: record.param,
-            result: record.result,
-            message: record.message
-          })
+          this.form = record
        }, 100)
      },
      handleCancel() {
-        this.form.resetFields()
        this.visible = false
      }
    }
--- a/src/views/system/log/oplog/index.vue
+++ b/src/views/system/log/oplog/index.vue
@ -51,7 +51,7 @@
                        success: 0
                      })
                  "
-                  >重置</a-button
+                >重置</a-button
                >
                <a @click="toggleAdvanced" style="margin-left: 8px">
                  {{ advanced ? '收起' : '展开' }}
@ -110,7 +110,7 @@
        </span>
        <span slot="action" slot-scope="text, record">
          <span slot="action">
-            <a @click="$refs.detailsOplog.details(record)">查看详情</a>
+            <a @click="handleLook(record)">查看详情</a>
          </span>
        </span>
      </s-table>
@ -120,7 +120,7 @@
 </template>
 <script>
 import { STable, Ellipsis, XCard } from '@/components'
-import { sysOpLogPage, sysOpLogDelete } from '@/api/modular/system/logManage'
+import { sysOpLogPage, sysOpLogDelete, sysOpLogdetail } from '@/api/modular/system/logManage'
 import detailsOplog from './details'
 import { sysEnumDataList } from '@/api/modular/system/enumManage'
 import moment from 'moment'
@ -202,6 +202,10 @@ export default {
      // 加载数据方法 必须为 Promise 对象
      loadData: parameter => {
        return sysOpLogPage(Object.assign(parameter, this.switchingDate())).then(res => {
+          res.data.pageNo = res.data.pageIndex
+          res.data.totalPage = res.data.totalPages
+          res.data.totalCount = res.data.totalRows
+          res.data.rows = res.data.items
          return res.data
        })
      },
@ -224,6 +228,11 @@ export default {
        return values[0].value
      }
    },
+    handleLook(row) {
+      sysOpLogdetail({ id: row.id }).then(res => {
+
+      })
+    },
    successFilter(success) {
      // eslint-disable-next-line eqeqeq
      const values = this.successDict.filter(item => item.code == success)