feat:合并

package-lock.json

@@ -8,6 +8,7 @@
             "name": "jdfstudy",
             "version": "0.1.0",
             "dependencies": {
+                "ant-design-vue": "^3.2.15",
                 "axios": "^1.1.3",
                 "core-js": "^3.26.0",
                 "dayjs": "^1.11.6",
@@ -67,6 +68,31 @@
                 "node": ">=6.0.0"
             }
         },
+        "node_modules/@ant-design/colors": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/@ant-design/colors/-/colors-6.0.0.tgz",
+            "integrity": "sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ==",
+            "dependencies": {
+                "@ctrl/tinycolor": "^3.4.0"
+            }
+        },
+        "node_modules/@ant-design/icons-svg": {
+            "version": "4.2.1",
+            "resolved": "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz",
+            "integrity": "sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw=="
+        },
+        "node_modules/@ant-design/icons-vue": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmmirror.com/@ant-design/icons-vue/-/icons-vue-6.1.0.tgz",
+            "integrity": "sha512-EX6bYm56V+ZrKN7+3MT/ubDkvJ5rK/O2t380WFRflDcVFgsvl3NLH7Wxeau6R8DbrO5jWR6DSTC3B6gYFp77AA==",
+            "dependencies": {
+                "@ant-design/colors": "^6.0.0",
+                "@ant-design/icons-svg": "^4.2.1"
+            },
+            "peerDependencies": {
+                "vue": ">=3.0.3"
+            }
+        },
         "node_modules/@babel/code-frame": {
             "version": "7.18.6",
             "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.18.6.tgz",
@@ -1678,7 +1704,6 @@
             "version": "7.19.0",
             "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.19.0.tgz",
             "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
-            "dev": true,
             "dependencies": {
                 "regenerator-runtime": "^0.13.4"
             },
@@ -2126,6 +2151,15 @@
             "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
             "dev": true
         },
+        "node_modules/@simonwep/pickr": {
+            "version": "1.8.2",
+            "resolved": "https://registry.npmmirror.com/@simonwep/pickr/-/pickr-1.8.2.tgz",
+            "integrity": "sha512-/l5w8BIkrpP6n1xsetx9MWPWlU6OblN5YgZZphxan0Tq4BByTCETL6lyIeY8lagalS2Nbt4F2W034KHLIiunKA==",
+            "dependencies": {
+                "core-js": "^3.15.1",
+                "nanopop": "^2.1.0"
+            }
+        },
         "node_modules/@soda/friendly-errors-webpack-plugin": {
             "version": "1.8.1",
             "resolved": "https://registry.npmmirror.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz",
@@ -3754,6 +3788,36 @@
                 "node": ">=4"
             }
         },
+        "node_modules/ant-design-vue": {
+            "version": "3.2.15",
+            "resolved": "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-3.2.15.tgz",
+            "integrity": "sha512-sJfE7LWimSdAPe4dzNyQBrmVMnOTNQTkG9oOyr+7W8qIYrX8sYWyC68Nn1uum4KBJUSZUa/BU6dohvTG0urBhA==",
+            "dependencies": {
+                "@ant-design/colors": "^6.0.0",
+                "@ant-design/icons-vue": "^6.1.0",
+                "@babel/runtime": "^7.10.5",
+                "@ctrl/tinycolor": "^3.4.0",
+                "@simonwep/pickr": "~1.8.0",
+                "array-tree-filter": "^2.1.0",
+                "async-validator": "^4.0.0",
+                "dayjs": "^1.10.5",
+                "dom-align": "^1.12.1",
+                "dom-scroll-into-view": "^2.0.0",
+                "lodash": "^4.17.21",
+                "lodash-es": "^4.17.15",
+                "resize-observer-polyfill": "^1.5.1",
+                "scroll-into-view-if-needed": "^2.2.25",
+                "shallow-equal": "^1.0.0",
+                "vue-types": "^3.0.0",
+                "warning": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=12.22.0"
+            },
+            "peerDependencies": {
+                "vue": ">=3.2.0"
+            }
+        },
         "node_modules/any-promise": {
             "version": "1.3.0",
             "resolved": "https://registry.npmmirror.com/any-promise/-/any-promise-1.3.0.tgz",
@@ -3791,6 +3855,11 @@
             "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
             "dev": true
         },
+        "node_modules/array-tree-filter": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/array-tree-filter/-/array-tree-filter-2.1.0.tgz",
+            "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw=="
+        },
         "node_modules/array-union": {
             "version": "2.1.0",
             "resolved": "https://registry.npmmirror.com/array-union/-/array-union-2.1.0.tgz",
@@ -4565,6 +4634,11 @@
             "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
             "dev": true
         },
+        "node_modules/compute-scroll-into-view": {
+            "version": "1.0.20",
+            "resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
+            "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg=="
+        },
         "node_modules/concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz",
@@ -5372,6 +5446,11 @@
                 "node": ">=6.0.0"
             }
         },
+        "node_modules/dom-align": {
+            "version": "1.12.4",
+            "resolved": "https://registry.npmmirror.com/dom-align/-/dom-align-1.12.4.tgz",
+            "integrity": "sha512-R8LUSEay/68zE5c8/3BDxiTEvgb4xZTF0RKmAHfiEVN3klfIpXfi2/QCoiWPccVQ0J/ZGdz9OjzL4uJEP/MRAw=="
+        },
         "node_modules/dom-converter": {
             "version": "0.2.0",
             "resolved": "https://registry.npmmirror.com/dom-converter/-/dom-converter-0.2.0.tgz",
@@ -5381,6 +5460,11 @@
                 "utila": "~0.4"
             }
         },
+        "node_modules/dom-scroll-into-view": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/dom-scroll-into-view/-/dom-scroll-into-view-2.0.1.tgz",
+            "integrity": "sha512-bvVTQe1lfaUr1oFzZX80ce9KLDlZ3iU+XGNE/bz9HnGdklTieqsbmsLHe+rT2XWqopvL0PckkYqN7ksmm5pe3w=="
+        },
         "node_modules/dom-serializer": {
             "version": "1.4.1",
             "resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-1.4.1.tgz",
@@ -7664,8 +7748,7 @@
         "node_modules/js-tokens": {
             "version": "4.0.0",
             "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
-            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-            "dev": true
         },
         "node_modules/js-yaml": {
             "version": "4.1.0",
@@ -8114,6 +8197,17 @@
                 "node": ">=4"
             }
         },
+        "node_modules/loose-envify": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmmirror.com/loose-envify/-/loose-envify-1.4.0.tgz",
+            "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+            "dependencies": {
+                "js-tokens": "^3.0.0 || ^4.0.0"
+            },
+            "bin": {
+                "loose-envify": "cli.js"
+            }
+        },
         "node_modules/lower-case": {
             "version": "2.0.2",
             "resolved": "https://registry.npmmirror.com/lower-case/-/lower-case-2.0.2.tgz",
@@ -8437,6 +8531,11 @@
                 "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
             }
         },
+        "node_modules/nanopop": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/nanopop/-/nanopop-2.2.0.tgz",
+            "integrity": "sha512-E9JaHcxh3ere8/BEZHAcnuD10RluTSPyTToBvoFWS9/7DcCx6gyKjbn7M7Bx7E1veCxCuY1iO6h4+gdAf1j73Q=="
+        },
         "node_modules/natural-compare": {
             "version": "1.4.0",
             "resolved": "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -9820,8 +9919,7 @@
         "node_modules/regenerator-runtime": {
             "version": "0.13.11",
             "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-            "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+            "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-            "dev": true
         },
         "node_modules/regenerator-transform": {
             "version": "0.15.0",
@@ -9931,6 +10029,11 @@
             "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
             "dev": true
         },
+        "node_modules/resize-observer-polyfill": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+            "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+        },
         "node_modules/resolve": {
             "version": "1.22.1",
             "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.1.tgz",
@@ -10126,6 +10229,14 @@
             "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
             "dev": true
         },
+        "node_modules/scroll-into-view-if-needed": {
+            "version": "2.2.31",
+            "resolved": "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz",
+            "integrity": "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==",
+            "dependencies": {
+                "compute-scroll-into-view": "^1.0.20"
+            }
+        },
         "node_modules/select-hose": {
             "version": "2.0.0",
             "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz",
@@ -10329,6 +10440,11 @@
                 "node": ">=8"
             }
         },
+        "node_modules/shallow-equal": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmmirror.com/shallow-equal/-/shallow-equal-1.2.1.tgz",
+            "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA=="
+        },
         "node_modules/shebang-command": {
             "version": "1.2.0",
             "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -11654,6 +11770,28 @@
             "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
             "dev": true
         },
+        "node_modules/vue-types": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmmirror.com/vue-types/-/vue-types-3.0.2.tgz",
+            "integrity": "sha512-IwUC0Aq2zwaXqy74h4WCvFCUtoV0iSWr0snWnE9TnU18S66GAQyqQbRf2qfJtUuiFsBf6qp0MEwdonlwznlcrw==",
+            "dependencies": {
+                "is-plain-object": "3.0.1"
+            },
+            "engines": {
+                "node": ">=10.15.0"
+            },
+            "peerDependencies": {
+                "vue": "^3.0.0"
+            }
+        },
+        "node_modules/vue-types/node_modules/is-plain-object": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-3.0.1.tgz",
+            "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
         "node_modules/vuex": {
             "version": "4.1.0",
             "resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.1.0.tgz",
@@ -11665,6 +11803,14 @@
                 "vue": "^3.2.0"
             }
         },
+        "node_modules/warning": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmmirror.com/warning/-/warning-4.0.3.tgz",
+            "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+            "dependencies": {
+                "loose-envify": "^1.0.0"
+            }
+        },
         "node_modules/watchpack": {
             "version": "2.4.0",
             "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.0.tgz",
@@ -12382,6 +12528,28 @@
                 "@jridgewell/trace-mapping": "^0.3.9"
             }
         },
+        "@ant-design/colors": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/@ant-design/colors/-/colors-6.0.0.tgz",
+            "integrity": "sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ==",
+            "requires": {
+                "@ctrl/tinycolor": "^3.4.0"
+            }
+        },
+        "@ant-design/icons-svg": {
+            "version": "4.2.1",
+            "resolved": "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz",
+            "integrity": "sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw=="
+        },
+        "@ant-design/icons-vue": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmmirror.com/@ant-design/icons-vue/-/icons-vue-6.1.0.tgz",
+            "integrity": "sha512-EX6bYm56V+ZrKN7+3MT/ubDkvJ5rK/O2t380WFRflDcVFgsvl3NLH7Wxeau6R8DbrO5jWR6DSTC3B6gYFp77AA==",
+            "requires": {
+                "@ant-design/colors": "^6.0.0",
+                "@ant-design/icons-svg": "^4.2.1"
+            }
+        },
         "@babel/code-frame": {
             "version": "7.18.6",
             "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.18.6.tgz",
@@ -13493,7 +13661,6 @@
             "version": "7.19.0",
             "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.19.0.tgz",
             "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
-            "dev": true,
             "requires": {
                 "regenerator-runtime": "^0.13.4"
             }
@@ -13856,6 +14023,15 @@
             "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
             "dev": true
         },
+        "@simonwep/pickr": {
+            "version": "1.8.2",
+            "resolved": "https://registry.npmmirror.com/@simonwep/pickr/-/pickr-1.8.2.tgz",
+            "integrity": "sha512-/l5w8BIkrpP6n1xsetx9MWPWlU6OblN5YgZZphxan0Tq4BByTCETL6lyIeY8lagalS2Nbt4F2W034KHLIiunKA==",
+            "requires": {
+                "core-js": "^3.15.1",
+                "nanopop": "^2.1.0"
+            }
+        },
         "@soda/friendly-errors-webpack-plugin": {
             "version": "1.8.1",
             "resolved": "https://registry.npmmirror.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz",
@@ -15150,6 +15326,30 @@
                 "color-convert": "^1.9.0"
             }
         },
+        "ant-design-vue": {
+            "version": "3.2.15",
+            "resolved": "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-3.2.15.tgz",
+            "integrity": "sha512-sJfE7LWimSdAPe4dzNyQBrmVMnOTNQTkG9oOyr+7W8qIYrX8sYWyC68Nn1uum4KBJUSZUa/BU6dohvTG0urBhA==",
+            "requires": {
+                "@ant-design/colors": "^6.0.0",
+                "@ant-design/icons-vue": "^6.1.0",
+                "@babel/runtime": "^7.10.5",
+                "@ctrl/tinycolor": "^3.4.0",
+                "@simonwep/pickr": "~1.8.0",
+                "array-tree-filter": "^2.1.0",
+                "async-validator": "^4.0.0",
+                "dayjs": "^1.10.5",
+                "dom-align": "^1.12.1",
+                "dom-scroll-into-view": "^2.0.0",
+                "lodash": "^4.17.21",
+                "lodash-es": "^4.17.15",
+                "resize-observer-polyfill": "^1.5.1",
+                "scroll-into-view-if-needed": "^2.2.25",
+                "shallow-equal": "^1.0.0",
+                "vue-types": "^3.0.0",
+                "warning": "^4.0.0"
+            }
+        },
         "any-promise": {
             "version": "1.3.0",
             "resolved": "https://registry.npmmirror.com/any-promise/-/any-promise-1.3.0.tgz",
@@ -15184,6 +15384,11 @@
             "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
             "dev": true
         },
+        "array-tree-filter": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/array-tree-filter/-/array-tree-filter-2.1.0.tgz",
+            "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw=="
+        },
         "array-union": {
             "version": "2.1.0",
             "resolved": "https://registry.npmmirror.com/array-union/-/array-union-2.1.0.tgz",
@@ -15828,6 +16033,11 @@
                 }
             }
         },
+        "compute-scroll-into-view": {
+            "version": "1.0.20",
+            "resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
+            "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg=="
+        },
         "concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz",
@@ -16456,6 +16666,11 @@
                 "esutils": "^2.0.2"
             }
         },
+        "dom-align": {
+            "version": "1.12.4",
+            "resolved": "https://registry.npmmirror.com/dom-align/-/dom-align-1.12.4.tgz",
+            "integrity": "sha512-R8LUSEay/68zE5c8/3BDxiTEvgb4xZTF0RKmAHfiEVN3klfIpXfi2/QCoiWPccVQ0J/ZGdz9OjzL4uJEP/MRAw=="
+        },
         "dom-converter": {
             "version": "0.2.0",
             "resolved": "https://registry.npmmirror.com/dom-converter/-/dom-converter-0.2.0.tgz",
@@ -16465,6 +16680,11 @@
                 "utila": "~0.4"
             }
         },
+        "dom-scroll-into-view": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/dom-scroll-into-view/-/dom-scroll-into-view-2.0.1.tgz",
+            "integrity": "sha512-bvVTQe1lfaUr1oFzZX80ce9KLDlZ3iU+XGNE/bz9HnGdklTieqsbmsLHe+rT2XWqopvL0PckkYqN7ksmm5pe3w=="
+        },
         "dom-serializer": {
             "version": "1.4.1",
             "resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-1.4.1.tgz",
@@ -18185,8 +18405,7 @@
         "js-tokens": {
             "version": "4.0.0",
             "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
-            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-            "dev": true
         },
         "js-yaml": {
             "version": "4.1.0",
@@ -18548,6 +18767,14 @@
                 }
             }
         },
+        "loose-envify": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmmirror.com/loose-envify/-/loose-envify-1.4.0.tgz",
+            "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+            "requires": {
+                "js-tokens": "^3.0.0 || ^4.0.0"
+            }
+        },
         "lower-case": {
             "version": "2.0.2",
             "resolved": "https://registry.npmmirror.com/lower-case/-/lower-case-2.0.2.tgz",
@@ -18801,6 +19028,11 @@
             "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz",
             "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
         },
+        "nanopop": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/nanopop/-/nanopop-2.2.0.tgz",
+            "integrity": "sha512-E9JaHcxh3ere8/BEZHAcnuD10RluTSPyTToBvoFWS9/7DcCx6gyKjbn7M7Bx7E1veCxCuY1iO6h4+gdAf1j73Q=="
+        },
         "natural-compare": {
             "version": "1.4.0",
             "resolved": "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -19828,8 +20060,7 @@
         "regenerator-runtime": {
             "version": "0.13.11",
             "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-            "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+            "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-            "dev": true
         },
         "regenerator-transform": {
             "version": "0.15.0",
@@ -19920,6 +20151,11 @@
             "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
             "dev": true
         },
+        "resize-observer-polyfill": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+            "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+        },
         "resolve": {
             "version": "1.22.1",
             "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.1.tgz",
@@ -20057,6 +20293,14 @@
                 }
             }
         },
+        "scroll-into-view-if-needed": {
+            "version": "2.2.31",
+            "resolved": "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz",
+            "integrity": "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==",
+            "requires": {
+                "compute-scroll-into-view": "^1.0.20"
+            }
+        },
         "select-hose": {
             "version": "2.0.0",
             "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz",
@@ -20239,6 +20483,11 @@
                 "kind-of": "^6.0.2"
             }
         },
+        "shallow-equal": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmmirror.com/shallow-equal/-/shallow-equal-1.2.1.tgz",
+            "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA=="
+        },
         "shebang-command": {
             "version": "1.2.0",
             "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -21280,6 +21529,21 @@
             "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
             "dev": true
         },
+        "vue-types": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmmirror.com/vue-types/-/vue-types-3.0.2.tgz",
+            "integrity": "sha512-IwUC0Aq2zwaXqy74h4WCvFCUtoV0iSWr0snWnE9TnU18S66GAQyqQbRf2qfJtUuiFsBf6qp0MEwdonlwznlcrw==",
+            "requires": {
+                "is-plain-object": "3.0.1"
+            },
+            "dependencies": {
+                "is-plain-object": {
+                    "version": "3.0.1",
+                    "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-3.0.1.tgz",
+                    "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g=="
+                }
+            }
+        },
         "vuex": {
             "version": "4.1.0",
             "resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.1.0.tgz",
@@ -21288,6 +21552,14 @@
                 "@vue/devtools-api": "^6.0.0-beta.11"
             }
         },
+        "warning": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmmirror.com/warning/-/warning-4.0.3.tgz",
+            "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+            "requires": {
+                "loose-envify": "^1.0.0"
+            }
+        },
         "watchpack": {
             "version": "2.4.0",
             "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.0.tgz",

package.json

@@ -12,6 +12,7 @@
         "build:test": "vite build --mode test"
     },
     "dependencies": {
+        "ant-design-vue": "^3.2.15",
         "axios": "^1.1.3",
         "core-js": "^3.26.0",
         "dayjs": "^1.11.6",

src/views/faceteach/FaceTeach.vue

@@ -5,6 +5,16 @@
       <div>课程列表</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
       <div style="font-weight: 700">课程详情</div>
+      <div v-if="pName !=''" class="return">
+        <div style="display: flex" @click="returnclick">
+          <img
+            class="img2"
+            style="margin-right: 22px"
+            src="../../assets/image/return.png"
+          />
+          <div class="text">返回</div>
+        </div>
+      </div>
     </div>
     <!-- 面包屑导航 -->
 
@@ -157,7 +167,7 @@
                   </div>
                 </div>
                 <div class="submit" @click="toWork" v-if="data.workDto?.workId">
-                  去作业
+                  交作业
                 </div>
               </div>
             </el-tab-pane>
@@ -204,7 +214,7 @@
             style="width: 21px; height: 23px"
             src="../../assets/image/livelecturer.png"
           />
-          <div class="text">直播讲师</div>
+          <div class="text">面授课讲师</div>
           <div class="box"></div>
         </div>
         <!--        todo #面授课接口 讲师缺少img和介绍-->
@@ -434,7 +444,16 @@ onUnmounted(() => {
       align-items: center;
     }
   }
-
+  .return {
+    position: absolute;
+    right: 10%;
+    .text {
+      text-align: center;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+    }
+  }
   .detailinfo {
     width: 100%;
     margin-top: 20px;

src/views/homework/HomeworkPage.vue

@@ -67,7 +67,9 @@
             </UploadImg>
             <div
               class="uploadDetail"
-              :style="{ display: showFileList ? 'block' : 'none' }"
+              :style="{ display: showFileList && fileList && fileList.length >0 ? 'block' : 'none' }"
+              @mousemove="showFileList = 1"
+              @mouseout="showFileList = 0"
               style="padding-top: 60px"
             >
               <div class="triangle"></div>
@@ -147,9 +149,12 @@
               />
             </div>
             <div  style="display: flex; justify-content: center">
-              <button class="tijiao" @click="handleClick">提交</button>
+              <button class="tijiao" @click="handleClick">{{submitList && submitList.length>0?"再次":""}}提交</button>
             </div>
          
+          
+          
+
             <div class=""></div>
 
             <div class="title" style="margin-top: 0px">
@@ -165,6 +170,7 @@
               <div class="historytitle">
                 <div class="content1">提交时间</div>
                 <div class="content2">作业内容</div>
+                <div class="content3">附件</div>
               </div>
               <div
                 v-for="(value, index) in submitList"
@@ -179,15 +185,14 @@
               >
                 <div class="content1" >{{ value.createTime }}</div>
                 <div class="content2">
-                  <div
+                  <div >
-                    style="
-                      width: 95%;
-                      overflow: hidden;
-                      text-overflow: ellipsis;
-                      white-space: nowrap;
-                    "
-                  >
                     {{ value.workUploadContent }}
+                   
+                  </div>
+                </div>
+                <div class="content3">
+                  <div >
+                    
                     <span style="margin-left: 10px">
                       <el-link target="_blank" type="primary" :href="value.workUploadAddress?.split(',')[0] || ''">{{value.workUploadAddress?.split(',')[0].split('/').at(-1)|| ''}}</el-link>
                     </span>
@@ -251,6 +256,20 @@
     </div>
     <!-- 详细信息 -->
   </div>
+
+  <el-dialog v-model="centerDialogVisible"  title="" width="20%" center :show-close="false" :align-center="true"> 
+  <div style="text-align: center;font-size:16px;">  <span style="color:black">
+     提交成功
+    </span></div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button class="cancel" style="color: #387DF7; border: 1px solid #387DF7;padding: 8px 32px; border-radius: 4px;"  @click="centerDialogVisible = false">取消</el-button>
+        <el-button class="back" style="background: #387DF7;box-shadow: 1px 2px 15px 1px rgba(56,125,247,0.34);border: 0px;padding: 8px 32px;" type="primary" @click="returnclick">
+          返回
+        </el-button>
+      </span>   
+    </template>
+  </el-dialog>
 </template>
 
 <script setup>
@@ -267,9 +286,13 @@ import { useRouter } from "vue-router";
 import UploadImg from "@/components/img/UploadImg.vue";
 import FileTypeImg from "@/components/FileTypeImg.vue";
 import { useRoute } from "vue-router/dist/vue-router";
+import {ElMessage} from "element-plus";
+//import AlertSuccess from "@/components/alert/AlertSuccess.vue";
 
 const fileList = ref([]);
 const uploadRef = ref();
+
+const centerDialogVisible =ref(false);
 const sbValue = ref({
   content: "",
   attach: "",
@@ -283,16 +306,23 @@ const {
 } = useRoute();
 
 const { data } = useRequest(TASK_WORK_DETAIL, { workId, taskId });
-console.log("data", data);
+
 const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, {
   workerId: workId,
 });
 
+const open=()=>{
+  centerDialogVisible.value = true
+};
 const showFileList = computed(()=>{
   return fileList.value.length
 })
 
 const handleClick = () => {
+  if(!sbValue.value.content){
+
+    return ElMessage.warning("请输入作业内容");
+  }
   request(TASK_WORK_COMMIT, {
     projectOrRouterLogo: type,
     workUploadContent: sbValue.value.content,
@@ -301,7 +331,9 @@ const handleClick = () => {
     type,
     taskId,
   }).then((res) => {
+    console.log(res);
     submitList.value.unshift(res.data);
+    open();
   });
   sbValue.value.content = "";
   fileList.value = [];
@@ -660,16 +692,29 @@ function reUpload(i) {
           }
 
           .content1 {
-            width: 150px;
             margin-top: 14px;
-            margin-left: 60px;
+            margin-left: 20px;
+            width: 160px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
           }
 
           .content2{
             margin-top: 14px;
-            margin-left: 80px;
+            margin-left: 20px;
-            width: 0;
+            width:460px;;
-            flex: 1;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+          .content3 {
+            margin-top: 14px;
+            margin-left: 20px;
+            width:230px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
           }
 
           .historycontent {
@@ -872,5 +917,32 @@ function reUpload(i) {
       }
     }
   }
+  .el-dialog {
+    color:black;
+    text-align: center;
+    font-size: 16px;
+    .title{
+      text-align: center;
     }
+    .dialog-footer{
+      .back{
+        background: #387DF7;
+        box-shadow: 1px 2px 15px 1px rgba(56,125,247,0.34);
+        border: 0px;
+        padding: 8px 32px;
+        border-radius: 4px;
+      }
+      .cancel{
+        background: #387DF7;
+        border: 0px;
+        padding: 8px 32px;
+        border: 1px solid #387DF7;
+        border-radius: 4px;
+      }
+     
+    }
+  }
+}
+
+
 </style>

src/views/moreActive/MoreActive.vue

@@ -75,49 +75,52 @@
             </div>
             <div class="activedetail">
               <div>
-                <div>活动时长：</div>
+                <span>活动时长：</span>
-                <div class="content">
+                <span class="content">
                   {{
                     data?.activityDuration
                       ? data?.activityDuration + "分钟"
                       : "-"
                   }}
-                </div>
+                </span>
               </div>
               <div>
-                <div>活动地点：</div>
+                <span>活动地点：</span>
-                <div class="content">
+                <span class="content">
                   {{ data?.activityAddress ? data?.activityAddress : "-" }}
-                </div>
+                </span>
               </div>
               <div>
-                <div>活动考勤：</div>
+                <span>活动考勤：</span>
-                <div class="content">
+                <span class="content">
                   {{
                     data?.beforeSignIn
-                      ? "开始前" + data?.beforeSignIn + "分钟开始签到"
+                      ? "活动开始前" + data?.beforeSignIn + "分钟开始签到"
                       : "-"
                   }}
-                </div>
+                </span>
-                <div class="content">
+                <span class="content">
                   {{
                     data?.afterSignIn
-                      ? "开始后" + data?.afterSignIn + "分钟结束签到"
+                      ? "活动开始后" + data?.afterSignIn + "分钟结束签到"
                       : "-"
                   }}
+                </span>
               </div>
-              </div>
+              <!--
               <div>
                 <div>活动完成标准：</div>
                 <div class="content">
                   {{ data?.standardSettings ? "仅签到" : "-" }}
                 </div>
               </div>
+              -->
+
               <div>
-                <div>活动说明：</div>
+                <span>活动说明：</span>
-                <div class="content">
+                <span class="content">
                   {{ data?.activityExplain ? data?.activityExplain : "-" }}
-                </div>
+                </span>
               </div>
             </div>
           </div>
@@ -145,9 +148,13 @@
 <script setup>
 import { TAS_ACTIVITY_DETAIL, TASK_ACTIVITY_SIGN, ACTIVITY } from "@/api/api";
 import { request, useRequest } from "@/api/request";
+import { useRouter } from "vue-router";
 import { useRoute } from "vue-router/dist/vue-router";
 import { ElMessage } from "element-plus";
-
+const router = useRouter();
+const returnclick = () => {
+  router.back();
+};
 const {
   query: { courseId: activityId, id: taskId, type, pName, sName },
 } = useRoute();

src/views/roadmap/LearnPath.vue

@@ -193,13 +193,8 @@ async function gofun({ routerId, name: routerName }) {
         path: "/pathdetails",
         query: { routerId, routerName },
       })
-    : window.open(
+    :window.open(`http://u-pre.boe.com/pc/forward?to=/fe-student/pathdetails&params=${encodeURIComponent(`routerId=${routerId}&routerName=${routerName}`)}`)
-        `http://localhost:5173/fe-student/pathdetails&params=${encodeURIComponent(
-          `routerId=${routerId}&routerName=${routerName}`
-        )}`
-      );
 }
-
 function toUnTask() {}
 </script>
 <style lang="scss">

src/views/survey/SurveyDetail.vue

@@ -40,7 +40,7 @@
     </div>
     <!-- 面包屑导航 -->
     <!-- 标题 -->
-    <div class="title">【评估】管理者进阶腾飞班 - 培训阶段性调研</div>
+    <div class="title">【评估】{{data.assessmentName}}</div>
     <!-- 标题 -->
     <!-- 基本信息 -->
     <div class="bascinfo">
@@ -203,6 +203,19 @@
     <!-- 基本信息 -->
     <!--    todo 测评页面 没有接口-->
   </div>
+  <el-dialog v-model="centerDialogVisible"  title="" width="20%" center :show-close="false" :align-center="true"> 
+  <div style="text-align: center;font-size:16px;">  <span style="color:black">
+     提交成功
+    </span></div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button class="cancel" style="color: #387DF7; border: 1px solid #387DF7;padding: 8px 32px; border-radius: 4px;"  @click="centerDialogVisible = false">取消</el-button>
+        <el-button class="back" style="background: #387DF7;box-shadow: 1px 2px 15px 1px rgba(56,125,247,0.34);border: 0px;padding: 8px 32px;" type="primary" @click="returnclick">
+          返回
+        </el-button>
+      </span>   
+    </template>
+  </el-dialog>
 </template>
 <script setup>
 import checkbox from "@/assets/image/checkbox.png";
@@ -211,6 +224,7 @@ import { useRoute, useRouter } from "vue-router/dist/vue-router";
 import { request, usePage, useRequest } from "@/api/request";
 import { ASSESSMENT_QUERY, ASSESSMENT_SUBMIT } from "@/api/api";
 import { ElMessage } from "element-plus";
+import {  ref} from "vue";
 
 const {
   query: { courseId, id: taskId, type, pName, sName },
@@ -219,21 +233,67 @@ const router = useRouter();
 const returnclick = () => {
   router.back();
 };
+
 const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId });
-console.log("data", data);
+const centerDialogVisible =ref(false);
+const open=()=>{
+  centerDialogVisible.value = true
+};
 function submit() {
   if (data.value.isSubmit) {
     return;
   }
+ console.log("data.value",data.value);
+ let list1 = data.value.assessmentEssayQuestionDtoList;
+ if(list1 &&list1.length > 0){
+  list1.forEach((item) => {
+    if(item && !item.content){
+     
+      return ElMessage.warning("您有未填写的评估题干");
+    }
+  })
+ }
+ let list2 = data.value.assessmentScoringQuestionDtoList;
+ if(list2 &&list2.length > 0){
+  list2.forEach((item) => {
+    if(item && !item.selectAnswer){
+     
+      return ElMessage.warning("您有未填写的评估题干");
+    }
+  })
+ }
+ let list3 = data.value.assessmentSingleChoiceDtoList;
+ if(list3 &&list3.length > 0){
+  let flag = 0;
+  list3.forEach((item) => {
+    flag = flag + item.select? 1 : 0;
+  })
+  if(flag ==0 ){
+   
+    return ElMessage.warning("您有未填写的评估题干");
+  }
+ }
+ let list4 = data.value.assessmentMultipleChoiceDtoList;
+ if(list4 &&list4.length > 0){
+  let flag = 0;
+  list4.forEach((item) => {
+    flag = flag + item.select? 1 : 0;
+  })
+  if(flag == 0 ){
+   
+    return ElMessage.warning("您有未填写的评估题干");
+  }
+ }
   data.value.isSubmit = !data.value.isSubmit;
   request(ASSESSMENT_SUBMIT, {
     assessmentId: courseId,
     taskId,
     type,
     result: JSON.stringify(data.value),
+  }).then(() => {
+    open();
   });
-  ElMessage.info("提交成功");
+
-  router.back();
 }
 </script>
 <style lang="scss">