Merge branch 'pre-release' into 'release'

Pre release

See merge request !4

.env

@@ -0,0 +1,16 @@
+VITE_BASE=/fe-student
+VITE_BASE_API=
+VITE_BASE_LOGIN_URL=https://u-pre.boe.com/web/
+VITE_PROXY_URL=http://111.231.196.214:30001
+
+
+VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
+VITE_BOE_TEST_OUT_DETAIL_URL=https://u-pre.boe.com/api/b1/tale/do-quiz?quizKid=
+VITE_BOE_EXAM_DETAIL_URL=https://u-pre.boe.com/pc/exam/test?id=
+
+VITE_BOE_API_URL=https://u-pre.boe.com
+
+VITE_TASK_WHITE_TYPE=-8-,-12-,-13-
+# VITE_TASK_WHITE_TYPE=-8-,-12-

.env.boe

@@ -0,0 +1,10 @@
+VITE_BASE=/fe-student
+VITE_BASE_API=/manageApi
+
+VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
+VITE_BOE_TEST_OUT_DETAIL_URL=https://u-pre.boe.com/api/b1/tale/do-quiz?quizKid=
+VITE_BOE_EXAM_DETAIL_URL=https://u-pre.boe.com/pc/exam/test?id=
+
+VITE_BOE_API_URL=https://u-pre.boe.com

.env.prod

@@ -0,0 +1,10 @@
+VITE_BASE=/fe-student-release
+VITE_BASE_API=/manageApi-release
+
+VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
+VITE_BOE_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid=
+VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc-release/exam/test?id=
+
+VITE_BOE_API_URL=https://u.boe.com

.env.release

@@ -0,0 +1,11 @@
+VITE_BASE=/fe-student-release
+VITE_BASE_API=/manageApi-release
+VITE_BASE_LOGIN_URL=https://u.boe.com/web/
+
+VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
+VITE_BOE_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid=
+VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc-release/exam/test?id=
+
+VITE_BOE_API_URL=https://u.boe.com

.gitignore

@@ -4,7 +4,7 @@ node_modules
 
 
 # local env files
-.env.local
+.env.test
 .env.*.local
 
 # Log files

package-lock.json

@@ -8,10 +8,12 @@
             "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",
-                "element-plus": "^2.2.20",
+                "element-plus": "^2.2.27",
+                "json-bigint": "^1.0.0",
                 "vue": "^3.2.45",
                 "vue-router": "^4.1.6",
                 "vuex": "^4.1.0"
@@ -66,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",
@@ -1677,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"
             },
@@ -2125,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",
@@ -3753,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",
@@ -3790,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",
@@ -3968,6 +4038,14 @@
                 "node": "*"
             }
         },
+        "node_modules/bignumber.js": {
+            "version": "9.1.1",
+            "resolved": "https://registry.npmmirror.com/bignumber.js/-/bignumber.js-9.1.1.tgz",
+            "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/binary-extensions": {
             "version": "2.2.0",
             "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -4556,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",
@@ -5363,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",
@@ -5372,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",
@@ -5465,9 +5558,9 @@
             "dev": true
         },
         "node_modules/element-plus": {
-            "version": "2.2.22",
+            "version": "2.2.27",
-            "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.22.tgz",
+            "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.27.tgz",
-            "integrity": "sha512-gg2g2WOMNpWf0wGesymUvTV0VZDF/4khQKroSNeCV/vWJ/cqssPYdtqfGxTiFRt/f+JpyFkV7O1mo0yzMCzrBg==",
+            "integrity": "sha512-P04HDOZBYDdvlYuleuCZRULzAc5xJVOBfLDK9xWxVo0vyo8ntdaXS5sTU+/76vrNzuO3FhLn9kvrsbiJEVa1jg==",
             "dependencies": {
                 "@ctrl/tinycolor": "^3.4.1",
                 "@element-plus/icons-vue": "^2.0.6",
@@ -7655,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",
@@ -7682,6 +7774,14 @@
                 "node": ">=4"
             }
         },
+        "node_modules/json-bigint": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/json-bigint/-/json-bigint-1.0.0.tgz",
+            "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+            "dependencies": {
+                "bignumber.js": "^9.0.0"
+            }
+        },
         "node_modules/json-parse-better-errors": {
             "version": "1.0.2",
             "resolved": "https://registry.npmmirror.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -8097,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",
@@ -8420,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",
@@ -9803,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",
@@ -9914,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",
@@ -10109,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",
@@ -10312,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",
@@ -11637,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",
@@ -11648,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",
@@ -12365,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",
@@ -13476,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"
             }
@@ -13839,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",
@@ -15133,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",
@@ -15167,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",
@@ -15310,6 +15532,11 @@
             "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
             "dev": true
         },
+        "bignumber.js": {
+            "version": "9.1.1",
+            "resolved": "https://registry.npmmirror.com/bignumber.js/-/bignumber.js-9.1.1.tgz",
+            "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="
+        },
         "binary-extensions": {
             "version": "2.2.0",
             "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -15806,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",
@@ -16434,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",
@@ -16443,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",
@@ -16527,9 +16769,9 @@
             "dev": true
         },
         "element-plus": {
-            "version": "2.2.22",
+            "version": "2.2.27",
-            "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.22.tgz",
+            "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.27.tgz",
-            "integrity": "sha512-gg2g2WOMNpWf0wGesymUvTV0VZDF/4khQKroSNeCV/vWJ/cqssPYdtqfGxTiFRt/f+JpyFkV7O1mo0yzMCzrBg==",
+            "integrity": "sha512-P04HDOZBYDdvlYuleuCZRULzAc5xJVOBfLDK9xWxVo0vyo8ntdaXS5sTU+/76vrNzuO3FhLn9kvrsbiJEVa1jg==",
             "requires": {
                 "@ctrl/tinycolor": "^3.4.1",
                 "@element-plus/icons-vue": "^2.0.6",
@@ -18163,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",
@@ -18181,6 +18422,14 @@
             "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
             "dev": true
         },
+        "json-bigint": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/json-bigint/-/json-bigint-1.0.0.tgz",
+            "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+            "requires": {
+                "bignumber.js": "^9.0.0"
+            }
+        },
         "json-parse-better-errors": {
             "version": "1.0.2",
             "resolved": "https://registry.npmmirror.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -18518,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",
@@ -18771,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",
@@ -19798,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",
@@ -19890,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",
@@ -20027,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",
@@ -20209,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",
@@ -21250,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",
@@ -21258,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

@@ -4,14 +4,20 @@
     "private": true,
     "scripts": {
         "dev": "vite",
-        "server": "vite build && vite preview",
+        "server": "vite build --mode boe && vite preview ",
-        "build": "vite build"
+        "build": "vite build --mode release",
+        "build:boe": "vite build --mode boe",
+        "build:prod": "vite build --mode prod",
+        "build:release": "vite build --mode release",
+        "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",
-        "element-plus": "^2.2.20",
+        "element-plus": "^2.2.27",
+        "json-bigint": "^1.0.0",
         "vue": "^3.2.45",
         "vue-router": "^4.1.6",
         "vuex": "^4.1.0"

src/App.vue

@@ -2,11 +2,21 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 17:28:10
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-13 22:10:22
+ * @LastEditTime: 2022-12-19 17:39:02
  * @FilePath: /fe-stu/src/App.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
+  <!-- <div
+    style="
+      background: #0078fc;
+      height: 150px;
+      width: 100%;
+      position: absolute;
+      top: 0;
+      z-index: 1;
+    "
+  ></div> -->
   <div id="container">
     <!-- <div id="nav">
       <router-link
@@ -21,29 +31,30 @@
         {{ item.name }}
       </router-link>
     </div> -->
-    <main>
+    <main style="z-index: 2">
       <router-view/>
     </main>
   </div>
 </template>
 <script setup>
+import {boeRequest} from "@/api/request";
+import {GET_USER_INFO} from "@/api/ThirdApi";
+import {useStore} from "vuex";
+import {onMounted} from "vue";
+import router from "@/router";
 
-  import {boeRequest} from "@/api/request";
+console.log("版本1.0.1------------");
-  import {GET_USER_INFO} from "@/api/ThirdApi";
+const store = useStore();
-  import { useStore } from "vuex";
+onMounted(() => {
-  import {onMounted} from "vue";
+  getUserInfo();
-
+});
-  const store = useStore();
-
-  onMounted(()=>{
-    getUserInfo()
-  })
-  function getUserInfo(){
-    boeRequest(GET_USER_INFO).then(res=>{
-      store.commit("SET_USER", res.result);
-    })
-  }
 
+function getUserInfo() {
+  boeRequest(GET_USER_INFO).then((res) => {
+    res.result.avatar = import.meta.env.VITE_BOE_API_URL + '/upload' + (res.result.avatar ? res.result.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png')
+    store.commit("SET_USER", res.result);
+  });
+}
 </script>
 <style lang="scss">
 #app {

src/api/api.js

@@ -2,26 +2,28 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-12-11 16:57:58
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-12 17:05:42
+ * @LastEditTime: 2022-12-18 18:37:26
  * @FilePath: /fe-stu/src/api/api.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-export const BASE = import.meta.env.DEV ? '' : '/manageApi'
-export const BASE_URL = import.meta.env.DEV ? '' : 'https://u-pre.boe.com/fe-student'
 export const LOGIN = '/admin/CheckUser/userLogin post'
 // export const FILE_UPLOAD = 'http://111.231.196.214:30001/file/upload'
-export const FILE_UPLOAD = '/file/upload'
+export const FILE_UPLOAD = import.meta.env.VITE_BASE_API + '/file/upload'
 export const COMMON_TOKEN = 'https://upload-z2.qiniup.com'
 export const ROUTER_CHAPTER_LIST = '/stu/router/chapterList'
 export const ROUTER_LIST = '/stu/router/list post'
 export const ROUTER_PROCESS = '/stu/router/process'
+export const LINK_DETAILS = linkId => `/link/getOne?linkId=${linkId} post`
 export const PROJECT_PROCESS = '/stu/project/process'
+export const ONLINE_PROCESS = '/onlineClasses/queryOnlineClassesStudyDetail post'
 export const ROUTER_UNCOMPLETE_LIST = '/stu/router/unCompleteTaskList post'
 export const TAS_ACTIVITY_DETAIL = '/activity'
-export const TASK_ACTIVITY_SIGN = '/activitySubmit/updateActivitySignInStatus post'
+export const TASK_ACTIVITY_SIGN = '/stu/task/activity/sign post'
+export const TASK_OFFCOURSE_NOTASK_SIGN = '/stu/task/offcourse/notask/sign post'
+export const TASK_OFFCOURSE_SIGN = '/stu/task/offcourse/sign post'
 export const TASK_BROADCAST_COMMIT = '/stu/task/broadcast/commit'
 export const TASK_BROADCAST_DETAIL = '/liveBroadcast'
-export const TASK_BROADCAST_SIGN = '/stu/task/broadcast/sign'
+export const TASK_BROADCAST_SIGN = '/stu/task/broadcast/sign post'
 export const TASK_VOTE_COMMIT = '/stu/task/vote/commit'
 export const TASK_VOTE_DETAIL = '/stu/task/vote/detail'
 export const TASK_WORK_COMMIT = '/workSubmit/submitStudentWorkDetail post'
@@ -49,7 +51,10 @@ export const COMMENT_PRAISE = '/comment/praise post'
 export const COMMENT_COLLECTION = '/comment/collection post'
 
 export const ASSESSMENT_SUBMIT_QUERY = assessmentId => `/assessmentSubmit/queryAssessmentSubmitDetailById?assessmentSubmitId=${assessmentId} post`
-export const ASSESSMENT_QUERY = assessmentId => `/assessment/queryAssessmentDetailById?assessmentId=${assessmentId} post`
+export const ASSESSMENT_QUERY = assessmentId => `/stu/task/evaluate/get`
-export const ASSESSMENT_SUBMIT = '/assessmentSubmit/submitAssessmentDetail'
+export const ASSESSMENT_SUBMIT = '/stu/task/evaluate/commit post'
 
 export const ACTIVITY = '/activity'
+
+export const STUDY_RECORD = '/stu/task/thirdTask/submit post'
+export const PROJECT_LIST = '/stu/project/list post'

src/api/method.js

@@ -0,0 +1,40 @@
+/*
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-19 11:35:37
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-19 11:38:29
+ * @FilePath: /fe-stu/src/views/project/method.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+// 修改时间格式---------start-----------------------------
+function formatNumber(n) {
+    n = n.toString();
+    return n[1] ? n : "0" + n;
+}
+
+function toDate(number, format) {
+    var formateArr = ["Y", "M", "D", "h", "m", "s"];
+    var returnArr = [];
+
+    if (number === 0) {
+        return 0;
+    } else {
+        var date = new Date(number * 1000);
+    }
+    returnArr.push(date.getFullYear());
+    returnArr.push(formatNumber(date.getMonth() + 1));
+    returnArr.push(formatNumber(date.getDate()));
+
+    returnArr.push(formatNumber(date.getHours()));
+    returnArr.push(formatNumber(date.getMinutes()));
+    returnArr.push(formatNumber(date.getSeconds()));
+
+    for (var i in returnArr) {
+        format = format.replace(formateArr[i], returnArr[i]);
+    }
+    return format;
+}
+// 修改时间格式---------end-----------------------------
+export {
+    toDate
+}

src/api/request.js

@@ -1,7 +1,9 @@
 import router from "@/router";
-import {reactive, ref, toRefs, watch} from "vue";
+import { reactive, ref, toRefs, watch } from "vue";
 import axios from 'axios';
-
+import { getCookie } from "@/api/utils";
+import JSONBigInt from 'json-bigint';
+const JSONBigIntStr = JSONBigInt({ storeAsString: true });
 export function usePage(_url, param) {
 
     const state = reactive({
@@ -10,18 +12,18 @@ export function usePage(_url, param) {
         total: 0,
         size: 10,
         current: 1,
-        params: {pageNo: 1, pageSize: 10, ...param}
+        params: { pageNo: 1, pageSize: 10, ...param }
     })
 
     watch(param, () => {
-        state.params = {...state.params, ...param}
+        state.params = { ...state.params, ...param }
         fetchData()
     })
 
     function fetchData() {
         state.loading = true
         request(_url, state.params).then(r => {
-            state.params.pageNo === 1 ? (state.data = (r.data.records||r.data.rows)) : (state.data = [...state.data, ...(r.data.records||r.data.rows)])
+            state.params.pageNo === 1 ? (state.data = (r.data.records || r.data.rows)) : (state.data = [...state.data, ...(r.data.records || r.data.rows)])
             state.size = r.data.size
             state.total = r.data.total
             state.current = r.data.current
@@ -84,34 +86,34 @@ export async function request(_url, params) {
         url,
         method,
         headers: {
-            'X-Token': localStorage.getItem('token'),
+            'token': getCookie('token'),
-            ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
+            ...method !== 'get' ? { 'Content-Type': 'application/json' } : {}
         },
-        baseURL: '/manageApi-release',
+        baseURL: import.meta.env.VITE_BASE_API,
-        ...method !== 'get' ? {data: JSON.stringify(body)} : {}
+        ...method !== 'get' ? { data: JSON.stringify(body) } : {}
     }).then(resp => resp.data).then(response => {
         if (response.code !== 200 && response.code !== 0) {
-            console.log(1111111111)
+            if (response.code === 1000) {
-            console.log(response.code)
+                import.meta.env.MODE === 'development' ? router.push({ path: '/login' }) : window.open(import.meta.env.VITE_BASE_LOGIN_URL)
-            if (import.meta.env.DEV && response.code === 1000) {
-                router.push({path: '/login'})
-            } else {
-                // response.showMsg && notification.open({
-                //     message: response.showMsg,
-                //     duration: 2,
-                // });
             }
+            // if (import.meta.env.DEV && response.code === 1000) {
+            //     router.push({path: '/login'})
+            // } else {
+            //     window.open()
+            // response.showMsg && notification.open({
+            //     message: response.showMsg,
+            //     duration: 2,
+            // });
+            // }
             throw new Error('接口异常')
         }
         return response
     }).catch(e => {
-        console.log(2222)
+        console.log('eeeee', e)
-        console.log(e)
         // router.push({path: '/login'})
     })
 }
 
-// 这个方法要有 和request不一样
 export async function boeRequest(_url, params) {
     const s = _url.split(' ')
     let url = s[0]
@@ -129,20 +131,16 @@ export async function boeRequest(_url, params) {
         }
     }
     const body = method !== 'get' ? params || {} : {}
-    return axios({
+    return fetch(url,{
-        url,
         method,
-        headers: {
+        headers:{
             token: getCookie('token'),
             ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
         },
-        baseURL: '',
+        ...method !== 'get' ? {body: JSON.stringify(body)} : {}
-        ...method !== 'get' ? {data: JSON.stringify(body)} : {}
+    }).then(res=>{
-    }).then(resp => resp.data).then(response => {
+        return res.text()
-        return response
+    }).then(res=>{
-    }).catch(e => {
+        return JSONBigIntStr.parse(res)
-        console.log(2222)
-        console.log(e)
-        // router.push({path: '/login'})
     })
 }

src/api/utils.js

@@ -2,8 +2,6 @@ import {watch, ref} from "vue";
 import {boeRequest} from "@/api/request";
 import {BASE, GET_USER_LIST} from "@/api/ThirdApi";
 
-const BASE_AVATAR = import.meta.env.DEV ? `${BASE}/upload` : ''
-
 export function useImage(src) {
     return new URL(`../assets/image/${src}`, import.meta.url).href
 }
@@ -15,7 +13,7 @@ export function setCookie(name, value, perpetual) {
 }
 
 export function getCookie(name) {
-    return document.cookie?.split(";").find(e => e.includes(name)).replace(`${name}=`, '') || ''
+    return document.cookie?.split(";").find(e => e.includes(name))?.replace(`${name}=`, '') || ''
 }
 
 export function useUserInfo(id) {
@@ -23,7 +21,7 @@ export function useUserInfo(id) {
     watch(id, () => {
         id.value && boeRequest(GET_USER_LIST, {id: id.value}).then(res => {
             userInfo.value = res.result.userInfoList[0]
-            userInfo.value.avatar = BASE_AVATAR + userInfo.value.avatar
+            userInfo.value.avatar = `${import.meta.env.VITE_BOE_API_URL}/upload${userInfo.value.avatar?userInfo.value.avatar:'/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'}`
         })
     })
     return userInfo

src/components/img/UploadImg.vue

@@ -1,66 +1,77 @@
 <template>
-  <el-upload
+	<el-upload :file-list="files" :action="FILE_UPLOAD" method="POST" :show-file-list="false" :on-change="handleChange"
-      :file-list="files"
+		:limit="max" ref="imageRef" :on-exceed="exceed">
-      :action="FILE_UPLOAD"
+		<template #trigger>
-      method="POST"
+			<div>
-      :show-file-list="false"
+				<slot></slot>
-      :on-change="handleChange"
+			</div>
-      ref="imageRef"
+		</template>
-  >
+	</el-upload>
-    <template #trigger>
-      <div>
-        <slot></slot>
-      </div>
-    </template>
-  </el-upload>
 </template>
 <script setup>
-import {FILE_UPLOAD} from "@/api/api";
+import { FILE_UPLOAD } from "@/api/api";
-import {defineProps, ref} from "vue";
+import { defineProps, ref, watch } from "vue";
+import { ElMessage } from "element-plus";
 
-const {modelValue = []} = defineProps({
+const props = defineProps({
-  modelValue: []
+	value: [],
+	max: {
+		type: Number,
+		default: 1
+	}
 })
 
 const emit = defineEmits()
 
-const files = ref(modelValue)
+const files = ref([])
 const imageRef = ref()
 
-function handleChange(e) {
+watch(props.value, () => {
-  console.log(e)
+	props.value.length || (files.value = props.value)
-  if (e.response && e.response.code === 200) {
+})
-    e.url = e.response.data
-  }
 
-  const index = files.value.findIndex(f => f.uid === e.uid)
+function exceed() {
-  if (index === -1) {
+	ElMessage.error(`只能上传${props.max}个附件`);
-    files.value.unshift(e)
+}
-  } else {
+
-    files.value[index] = e
+function handleChange(e) {
-  }
+	if (e.response && e.response.code === 200) {
-  emit('update:modelValue', files)
+		e.url = e.response.data
+	}
+
+	const index = files.value.findIndex(f => f.uid === e.uid)
+	if (index === -1) {
+		files.value.unshift(e)
+	} else {
+		files.value[index] = e
+	}
+	emit('update:value', files.value)
 }
 
 function remove(i) {
-  files.value.splice(i, 1)
+	files.value.splice(i, 1)
+	console.log(imageRef)
+}
+
+function clearFiles() {
+	imageRef.value.clearFiles();
 }
 
 function reUpload(i) {
-  if (files.value[i].status === 'ready' || files.value[i].status === 'uploading') {
+	if (files.value[i].status === 'ready' || files.value[i].status === 'uploading') {
-    imageRef.value.abort(files.value[i].raw)
+		imageRef.value.abort(files.value[i].raw)
-    files.value[i].status = 'abort';
+		files.value[i].status = 'abort';
-  } else if (files.value[i].status === 'fail'||files.value[i].status === 'abort') {
+	} else if (files.value[i].status === 'fail' || files.value[i].status === 'abort') {
-    imageRef.value.handleStart(files.value[i].raw)
+		imageRef.value.handleStart(files.value[i].raw)
-    imageRef.value.submit()
+		imageRef.value.submit()
-  }
+	}
 }
 
 function abort(i) {
-  imageRef.value.abort(files.value[i].raw)
+	imageRef.value.abort(files.value[i].raw)
 }
 
 
-defineExpose({reUpload, remove})
+defineExpose({ reUpload, remove, clearFiles })
 
 </script>

src/main.js

@@ -1,4 +1,12 @@
-import {createApp} from 'vue'
+/*
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-11 16:57:58
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-18 16:31:00
+ * @FilePath: /fe-stu/src/main.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import { createApp } from 'vue'
 import App from './App.vue'
 import router from './router'
 import store from './store'

src/views/ballot/BallotPage.vue

@@ -2,18 +2,28 @@
   <div class="moreactive" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
-      <div>混合制项目</div>
+      <div>{{ pName }}</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
-      <div>管理者进阶-腾飞班</div>
+      <div>{{ sName }}</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
       <div style="font-weight: 700; font-size: 16px">投票详情</div>
-
+ <!--
       <div class="preNext">
         <button class="btn btn01"></button>
         <span class="content" style="margin-left: 6px">上一个</span>
         <span class="content" style="margin-left: 31px">下一个</span>
         <button class="btn btn02" style="margin-left: 6px"></button>
       </div>
+-->
+<div 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>
     <!-- 面包屑导航 -->
     <div class="debateTitle">【投票】{{ dataInfo?.voteName }}</div>
@@ -24,8 +34,8 @@
           <div class="left">
             <div class="title">
               <img
-                style="width: 20px; height: 20px"
+                  style="width: 20px; height: 20px"
-                src="../../assets/image/yuan.png"
+                  src="../../assets/image/yuan.png"
               />
               <div class="text">参与情况</div>
               <div class="box"></div>
@@ -36,8 +46,8 @@
                 <div class="item1" style="color: #089dff">
                   {{
                     dataInfo.numberOfInvolved || dataInfo.numberOfInvolved == 0
-                      ? dataInfo.numberOfInvolved
+                        ? dataInfo.numberOfInvolved
-                      : "-"
+                        : "-"
                   }}
                 </div>
                 <div class="item2">参与数</div>
@@ -46,8 +56,8 @@
                 <div class="item1" style="color: #387df7">
                   {{
                     dataInfo.votesTotal || dataInfo.votesTotal == 0
-                      ? dataInfo.votesTotal
+                        ? dataInfo.votesTotal
-                      : "-"
+                        : "-"
                   }}
                 </div>
                 <div class="item2">总票数</div>
@@ -56,8 +66,8 @@
                 <div class="item1" style="color: #00c6ff">
                   {{
                     dataInfo.numberOfBrowse || dataInfo.numberOfBrowse == 0
-                      ? dataInfo.numberOfBrowse
+                        ? dataInfo.numberOfBrowse
-                      : "-"
+                        : "-"
                   }}
                 </div>
                 <div class="item2">浏览数</div>
@@ -66,8 +76,8 @@
 
             <div class="title">
               <img
-                style="width: 20px; height: 20px"
+                  style="width: 20px; height: 20px"
-                src="../../assets/image/yuan.png"
+                  src="../../assets/image/yuan.png"
               />
               <div class="text">参与投票</div>
               <div class="box"></div>
@@ -75,9 +85,9 @@
 
             <div class="join">
               <div
-                v-for="(item, index) in dataInfo.ballotVo?.voteStemVoList"
+                  v-for="(item, index) in dataInfo.ballotVo?.voteStemVoList"
-                :key="index"
+                  :key="index"
-                style="margin-bottom: 41px"
+                  style="margin-bottom: 41px"
               >
                 <div class="stem">
                   <div>{{ item.orderNumber }}、</div>
@@ -85,21 +95,21 @@
                 </div>
                 <div class="options">
                   <div
-                    v-for="(value, key) in item.optionDetailList"
+                      v-for="(value, key) in item.optionDetailList"
-                    :key="key"
+                      :key="key"
-                    style="
+                      style="
                       width: 140px;
                       margin-right: 114px;
                       margin-bottom: 25px;
                     "
                   >
                     <img
-                      style="width: 140px; height: 140px; border-radius: 8px"
+                        style="width: 140px; height: 140px; border-radius: 8px"
-                      :src="value.optionPictureAddress"
+                        :src="value.optionPictureAddress"
                     />
                     <div class="radio">
                       <label>
-                        <input type="radio" name="one" value="right" />
+                        <input type="radio" name="one" value="right"/>
                         <div class="option"></div>
                         <div class="opt-text">{{ value.optionName }}</div>
                       </label>
@@ -109,7 +119,7 @@
               </div>
             </div>
             <div
-              style="
+                style="
                 width: 100%;
                 display: flex;
                 justify-content: center;
@@ -122,8 +132,8 @@
           <div class="right">
             <div class="righttitle">
               <img
-                style="width: 20px; height: 20px"
+                  style="width: 20px; height: 20px"
-                src="../../assets/image/yuan.png"
+                  src="../../assets/image/yuan.png"
               />
               <div class="text">投票时间</div>
               <div class="box"></div>
@@ -140,21 +150,21 @@
                 <div class="endtimetext">
                   距离结束还有&nbsp;&nbsp;
                   <span class="te">{{
-                    parseInt(
+                      parseInt(
-                      dayjs(dataInfo?.voteEndTime).diff(dayjs(), "minute") / 60
+                          dayjs(dataInfo?.voteEndTime).diff(dayjs(), "minute") / 60
-                    )
+                      )
-                  }}</span
+                    }}</span
                   >&nbsp;&nbsp; 小时&nbsp;&nbsp;<span class="te">{{
                     dayjs(dataInfo?.voteEndTime).diff(dayjs(), "minute") % 60
                   }}</span
-                  >&nbsp;&nbsp;分钟
+                >&nbsp;&nbsp;分钟
                 </div>
               </div>
             </div>
             <div class="righttitle">
               <img
-                style="width: 20px; height: 20px"
+                  style="width: 20px; height: 20px"
-                src="../../assets/image/yuan.png"
+                  src="../../assets/image/yuan.png"
               />
 
               <div class="text">投票说明</div>
@@ -162,8 +172,8 @@
             </div>
             <div class="explain clearfix">
               <div
-                class="explaincontent"
+                  class="explaincontent"
-                v-html="
+                  v-html="
                   dataInfo?.voteExplain ? dataInfo?.voteExplain : '暂无说明'
                 "
               ></div>
@@ -177,16 +187,13 @@
 </template>
 
 <script setup>
-import { useRequest } from "@/api/request";
+import {useRequest} from "@/api/request";
 import {
-  ROUTER_CHAPTER_LIST,
-  ROUTER_LIST,
-  TASK_VOTE_DETAIL,
   VOTE_DETAIL2,
 } from "@/api/api";
 import dayjs from "dayjs";
-import { useRoute } from "vue-router/dist/vue-router";
+import {useRoute} from "vue-router/dist/vue-router";
-import { watch, reactive, toRefs } from "vue";
+import {watch, reactive, toRefs} from "vue";
 // const { data } = useRequest(TASK_VOTE_DETAIL, {});
 // console.log("datadatadata", data);
 // const state = reactive({
@@ -194,12 +201,13 @@ import { watch, reactive, toRefs } from "vue";
 // });
 // let { votedetail } = toRefs(state);
 const {
-  query: { courseId },
+  query: {courseId, pName, sName},
 } = useRoute();
 //获取基本信息
-const { data: dataInfo } = useRequest(VOTE_DETAIL2(courseId));
+const {data: dataInfo} = useRequest(VOTE_DETAIL2(courseId));
 
-const submitVote = () => {};
+const submitVote = () => {
+};
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
@@ -219,7 +227,16 @@ const submitVote = () => {};
     line-height: 24px;
     position: relative;
   }
-
+  .return{
+    position: absolute;
+    right: 10%;
+    .text{
+      text-align: center;
+     display: flex;
+     flex-direction: row;
+     align-items: center;
+    }
+  }
   .preNext {
     position: absolute;
     right: 0px;
@@ -399,26 +416,26 @@ const submitVote = () => {};
           .allbox1 {
             margin-right: 22px;
             background: linear-gradient(
-              0deg,
+                    0deg,
-              rgba(160, 193, 230, 0) 0%,
+                    rgba(160, 193, 230, 0) 0%,
-              rgba(161, 195, 231, 0.2) 100%
+                    rgba(161, 195, 231, 0.2) 100%
             );
           }
 
           .allbox2 {
             margin-right: 22px;
             background: linear-gradient(
-              0deg,
+                    0deg,
-              rgba(177, 219, 229, 0) 0%,
+                    rgba(177, 219, 229, 0) 0%,
-              rgba(172, 216, 227, 0.2) 100%
+                    rgba(172, 216, 227, 0.2) 100%
             );
           }
 
           .allbox3 {
             background: linear-gradient(
-              0deg,
+                    0deg,
-              rgba(195, 209, 234, 0) 0%,
+                    rgba(195, 209, 234, 0) 0%,
-              rgba(191, 206, 231, 0.2) 100%
+                    rgba(191, 206, 231, 0.2) 100%
             );
           }
 
@@ -453,6 +470,7 @@ const submitVote = () => {};
           margin-top: 32px;
           margin-left: 21px;
           flex: 1;
+
           .stem {
             display: flex;
             font-size: 16px;
@@ -460,22 +478,26 @@ const submitVote = () => {};
             color: #333330;
             line-height: 38px;
           }
+
           .options {
             display: flex;
             align-items: center;
             flex-wrap: wrap;
           }
+
           .radio {
             margin-top: 14px;
             margin-left: -16px;
             position: relative;
           }
+
           .radio label {
             line-height: 20px;
             position: relative;
             display: flex;
             align-items: center;
             font-weight: normal;
+
             .opt-text {
               font-size: 14px;
               font-weight: bold;

src/views/debate/DebatePage.vue

@@ -2,17 +2,27 @@
   <div class="moreactive">
     <!-- 面包屑导航 -->
     <div class="crumb">
-      <div>混合制项目</div>
+      <div>{{ pName }}</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
-      <div>管理者进阶-腾飞班</div>
+      <div>{{ sName }}</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
       <div style="font-weight: 700; font-size: 16px">辩论详情</div>
+<!--
       <div class="preNext">
         <button class="btn btn01"></button>
         <span class="content" style="margin-left: 6px">上一个</span>
         <span class="content" style="margin-left: 31px">下一个</span>
         <button class="btn btn02" style="margin-left: 6px"></button>
-      </div>
+      </div>-->
+      <div 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>
     <!-- 面包屑导航 -->
     <div class="debateTitle">
@@ -85,7 +95,7 @@ import { TASK_VOTE_DETAIL, VOTE_DETAIL } from "@/api/api";
 import { useRoute } from "vue-router/dist/vue-router";
 
 const {
-  query: { id: voteSubmitId },
+  query: { id: voteSubmitId, pName, sName },
 } = useRoute();
 const { data } = useRequest(TASK_VOTE_DETAIL, { voteSubmitId });
 const { data: voteDetail } = useRequest(VOTE_DETAIL, { voteSubmitId });
@@ -107,7 +117,16 @@ const handleClick = (id) => {};
     line-height: 24px;
     position: relative;
   }
-
+  .return{
+    position: absolute;
+    right: 10%;
+    .text{
+      text-align: center;
+     display: flex;
+     flex-direction: row;
+     align-items: center;
+    }
+  }
   .preNext {
     position: absolute;
     right: 0px;

src/views/discuss/DiscussPage.vue

@@ -5,12 +5,13 @@
       style="display: flex; align-items: center; justify-content: space-between"
     >
       <div class="crumb">
-        <div>混合制项目</div>
+        <div>{{ pName }}</div>
         <div style="margin-left: 6px; margin-right: 6px">/</div>
-        <div>管理者进阶-腾飞班</div>
+        <div>{{ sName }}</div>
         <div style="margin-left: 6px; margin-right: 6px">/</div>
         <div style="font-weight: 700; font-size: 16px">讨论详情</div>
       </div>
+      <!--
       <div class="prevnext">
         <div class="prev">
           <img
@@ -26,7 +27,16 @@
             src="../../assets/image/next.png"
           />
         </div>
-      </div>
+      </div>-->
+      <div 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>
     <!-- 面包屑导航 -->
     <!-- 标题 -->
@@ -109,8 +119,11 @@ import { reactive, ref, toRefs } from "vue";
 import { useRoute, useRouter } from "vue-router";
 
 const router = useRouter();
+const returnclick = () => {
+  router.back();
+};
 const {
-  query: { id, type },
+  query: { id, type, pName, sName },
 } = useRoute();
 
 const param = ref({
@@ -159,7 +172,16 @@ function collection(d) {
     font-size: 14px;
     line-height: 24px;
   }
-
+  .return{
+    position: absolute;
+    right: 10%;
+    .text{
+      text-align: center;
+     display: flex;
+     flex-direction: row;
+     align-items: center;
+    }
+  }
   .prevnext {
     display: flex;
     align-items: center;

src/views/discussdetail/DiscussDetail.vue

@@ -5,12 +5,13 @@
       style="display: flex; align-items: center; justify-content: space-between"
     >
       <div class="crumb">
-        <div>混合制项目</div>
+        <div>{{ pName }}</div>
         <div style="margin-left: 6px; margin-right: 6px">/</div>
-        <div>管理者进阶-腾飞班</div>
+        <div>{{ sName }}</div>
         <div style="margin-left: 6px; margin-right: 6px">/</div>
         <div style="font-weight: 700; font-size: 16px">讨论详情</div>
       </div>  
+      <!--
       <div class="prevnext">
         <div class="prev">
           <img
@@ -26,7 +27,17 @@
             src="../../assets/image/next.png"
           />
         </div>
-      </div>
+      </div>-->
+
+      <div 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> 
     <!-- 面包屑导航 -->
     <!-- 标题 -->
@@ -295,7 +306,7 @@ import {
 import UploadImg from "@/components/img/UploadImg.vue";
 
 const {
-  query: { id, discussSubmitId, type },
+  query: { id, discussSubmitId, type, pName, sName },
 } = useRoute();
 
 const { data: commontList, fetchData: commonFetch } = usePage(COMMENT_LIST, {
@@ -389,7 +400,16 @@ function submitReplayComment() {
     font-size: 14px;
     line-height: 24px;
   }
-
+  .return{
+    position: absolute;
+    right: 10%;
+    .text{
+      text-align: center;
+     display: flex;
+     flex-direction: row;
+     align-items: center;
+    }
+  }
   .prevnext {
     display: flex;
     align-items: center;

src/views/examination/ExamPage.vue

@@ -5,12 +5,13 @@
       style="display: flex; align-items: center; justify-content: space-between"
     >
       <div class="crumb">
-        <div>混合制项目</div>
+        <div>{{ pName }}</div>
         <div style="margin-left: 6px; margin-right: 6px">/</div>
-        <div>管理者进阶-腾飞班</div>
+        <div>{{ sName }}</div>
         <div style="margin-left: 6px; margin-right: 6px">/</div>
         <div style="font-weight: 700; font-size: 16px">考试详情</div>
       </div>
+        <!--
       <div class="prevnext">
         <div class="prev">
           <img
@@ -26,7 +27,16 @@
             src="../../assets/image/next.png"
           />
         </div>
-      </div>
+      </div>-->
+      <div 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>
     <!-- 面包屑导航 -->
     <!-- 标题 -->
@@ -119,7 +129,7 @@ import { usePage, useRequest } from "@/api/request";
 import { COMMENT_LIST, DISCUSS_DETAIL, EXAMINATION_QUERY } from "@/api/api";
 
 const {
-  query: { id, discussSubmitId },
+  query: { id, discussSubmitId, pName, sName },
 } = useRoute();
 
 const { data } = useRequest(EXAMINATION_QUERY(159), {});
@@ -133,7 +143,16 @@ const { data } = useRequest(EXAMINATION_QUERY(159), {});
     font-size: 14px;
     line-height: 24px;
   }
-
+  .return{
+    position: absolute;
+    right: 10%;
+    .text{
+      text-align: center;
+     display: flex;
+     flex-direction: row;
+     align-items: center;
+    }
+  }
   .prevnext {
     display: flex;
     align-items: center;

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>
     <!-- 面包屑导航 -->
 
@@ -18,7 +28,7 @@
             src="../../assets/image/time.png"
           />
           <div style="margin-left: 8px">
-            {{ data.offcourseDto?.publishTime }}
+            {{ data.planDto?.beginTime + "至" + data.planDto?.endTime }}
           </div>
         </div>
         <div class="time" style="margin-top: 23px">
@@ -29,8 +39,41 @@
           <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
         </div>
       </div>
-      <div class="btn" @click="toSurvery" v-if="data.planDto?.evalFlag">
+      <div style="display: flex">
-        评估
+        <botton
+          v-if="!isAllowSign"
+          class="btn"
+          style="margin-right: 20px; background: #999"
+          @click="signClick"
+          >签到
+        </botton>
+        <botton
+          v-if="isAllowSign"
+          class="btn"
+          style="margin-right: 20px"
+          :style="{
+            background: data.signFlag ? '#999' : 'rgb(57, 146, 249)',
+          }"
+          @click="signClick"
+          >{{ data.signFlag ? "已签到" : "签到" }}
+        </botton>
+        <botton
+          style="background: #999"
+          class="btn"
+          @click="toSurvery"
+          v-if="data.planDto?.evalFlag == 0"
+        >
+          评估
+        </botton>
+        <botton
+          :style="{
+            background: `${new Date(data.planDto.beginTime).getTime()>new Date().getTime()? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
+          }"
+          class="btn"
+          @click="toSurvery"
+          v-if="data.planDto?.evalFlag && data.planDto?.evalFlag == 1"
+          >{{ data.isSurvery ? "已评估" : "评估" }}
+        </botton>
       </div>
     </div>
     <!-- 基本信息 -->
@@ -57,7 +100,20 @@
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="课程附件" name="first">
               <div
-                v-for="(el, index) in data.planDto?.attach.split(',')"
+                v-if="data.planDto?.attach === '[]'"
+                style="
+                  font-size: 14px;
+                  font-weight: 400;
+                  line-height: 24px;
+                  cursor: pointer;
+                  margin-left: 40px;
+                  margin-top: 20px;
+                "
+              >
+                此课程无附件
+              </div>
+              <div
+                v-for="(el, index) in JSON.parse(data.planDto?.attach)"
                 :key="index"
                 v-if="data.planDto"
                 class="enclosure"
@@ -65,26 +121,60 @@
               >
                 <div class="enclosureL">
                   <FileTypeImg
-                    v-model="data.planDto.attach.split(',')[index]"
+                    v-model="el.name"
                     :style="{
                       width: '22px',
                       height: '26px',
                       marginLeft: '10px',
                     }"
                   ></FileTypeImg>
-                  <div style="margin-left: 20px">{{ el }}</div>
+                  <div style="margin-left: 20px">{{ el.name }}</div>
                 </div>
-                <div class="download">
+                <div 
+                  v-if="new Date(data.planDto.beginTime).getTime() > new Date().getTime()"
+                  class="download">
                   <img
                     style="width: 16px; height: 15px"
                     src="../../assets/image/download.png"
                   />
-                  <div style="margin-left: 5px" @click="download(el)">下载</div>
+                  <div
+                    style="margin-left: 5px;color:#999;"
+                    @click="downloads(el.response.data)"
+                  >
+                    下载
+                  </div>
+                </div>
+                <div 
+                  v-else
+                  class="download">
+                  <img
+                    style="width: 16px; height: 15px"
+                    src="../../assets/image/download.png"
+                  />
+                  <div
+                    style="margin-left: 5px"
+                    @click="download(el.response.data)"
+                  >
+                    下载
+                  </div>
                 </div>
               </div>
             </el-tab-pane>
             <el-tab-pane label="课程作业" name="second">
-              <div class="work">
+              <div
+                v-if="data.planDto?.attach === '[]'"
+                style="
+                  font-size: 14px;
+                  font-weight: 400;
+                  line-height: 24px;
+                  cursor: pointer;
+                  margin-left: 40px;
+                  margin-top: 20px;
+                "
+              >
+                此课程无作业
+              </div>
+              <div class="work" v-if="data.workDto?.workName">
                 <div>
                   <div class="question">{{ data.workDto?.workName }}</div>
                   <div style="margin-top: 16px; display: flex">
@@ -92,13 +182,32 @@
                     <div class="tag3" style="margin-left: 11px">作业</div>
                   </div>
                 </div>
-                <div class="submit" @click="toWork" v-if="data.workDto?.workId">
+                
-                  提交
+                <div v-if="isEndSubMitWork()" class="submit" style="background: #999">
+                  已结束
+                </div>
+                <div 
+                  :style="{background: new Date(data.planDto.beginTime).getTime() > new Date().getTime()?'#999':''}"
+                  v-else class="submit" @click="toWork" v-if="data.workDto?.workId">
+                  交作业
                 </div>
               </div>
             </el-tab-pane>
             <el-tab-pane label="课程考试" name="third">
-              <div class="work">
+              <div
+                v-if="data.planDto?.attach === '[]'"
+                style="
+                  font-size: 14px;
+                  font-weight: 400;
+                  line-height: 24px;
+                  cursor: pointer;
+                  margin-left: 40px;
+                  margin-top: 20px;
+                "
+              >
+                此课程无考试
+              </div>
+              <div class="work" v-if="data.examinationDto?.examinationTestName">
                 <div>
                   <div class="question">
                     {{ data.examinationDto?.examinationTestName }}
@@ -113,9 +222,9 @@
                     <div class="tag3" style="margin-left: 11px">考试</div>
                   </div>
                 </div>
-                <!--                <div class="submit" @click="toExamItem(data.examinationDto)">-->
+                <div :style="{background: new Date(data.planDto.beginTime).getTime() > new Date().getTime()?'#999':''}" class="submit" @click="toExamItem(data.examinationDto)">
-                <!--                  去考试-->
+                  去考试
-                <!--                </div>-->
+                </div>
               </div>
             </el-tab-pane>
           </el-tabs>
@@ -127,12 +236,12 @@
             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和介绍-->
         <div class="teacheritem">
-          <img class="peopleimg" :src="userAvatar" />
+          <img class="peopleimg" :src="teacherInfo.avatar" />
           <div style="margin-left: 17px; width: 190px">
             <div class="teacherName" style="margin-right: 5px">
               {{ data.planDto?.teacher }}
@@ -148,57 +257,208 @@
 </template>
 
 <script setup>
-import { computed, reactive, toRefs, watch } from "vue";
+import { computed, reactive, toRefs, watch, onUnmounted } from "vue";
 import FileTypeImg from "@/components/FileTypeImg.vue";
 import { request, useRequest } from "@/api/request";
-import { STU_OFFCOURSE_DETAIL } from "@/api/api";
+import {
+  STU_OFFCOURSE_DETAIL,
+  TASK_OFFCOURSE_NOTASK_SIGN,
+  TASK_OFFCOURSE_SIGN,
+  TASK_BROADCAST_SIGN,
+} from "@/api/api";
 import { useRoute, useRouter } from "vue-router";
 import { useUserInfo } from "@/api/utils";
-
+import { ElMessage, messageConfig } from "element-plus";
 const router = useRouter();
+const returnclick = () => {
+  router.back();
+};
 const {
-  query: { courseId, type },
+  query: { courseId, type, id: taskId },
 } = useRoute();
 
 const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId });
-
+console.log("datadatadatadatadatadatadata", data);
-const { avatar: userAvatar } = useUserInfo(
+const teacherInfo = useUserInfo(
   computed(() => data.value?.planDto?.teacherId)
 );
 
 const state = reactive({
   activeName: "first",
   enclosure: "",
+  isAllowSign: false,
 });
-const { activeName, enclosure } = toRefs(state);
+const { activeName, enclosure, isAllowSign } = toRefs(state);
 const handleClick = (tab, event) => {
   console.log(tab, event);
 };
 const download = (url) => {
   window.open(url);
 };
+const downloads = (url) => {
+  ElMessage.info("面授课未开始");
+};
+let timer = null;
+//判断能否签到
+function isSignClick() {
+  timer = setInterval(() => {
+    let beginTime = new Date(data.value.planDto.beginTime).getTime();
+    let endTime = !data.value.planDto.afterStart
+      ? new Date(data.value.planDto.endTime).getTime()
+      : new Date(data.value.planDto.beginTime).getTime();
+    let nowTime = new Date().getTime();
+    if (data.value.planDto.beforeStart && data.value.planDto.afterStart) {
+      //有开始前有开始后
+      beginTime = beginTime - data.value.planDto.beforeStart * 60 * 1000;
+      endTime = endTime + data.value.planDto.afterStart * 60 * 1000;
+      console.log("1111");
+    } else if (
+      data.value.planDto.beforeStart &&
+      !data.value.planDto.afterStart
+    ) {
+      //只有开始前无开始后
+      beginTime = beginTime - data.value.planDto.beforeStart * 60 * 1000;
+      console.log("11112222");
+    } else if (
+      !data.value.planDto.beforeStart &&
+      data.value.planDto.afterStart
+    ) {
+      //无开始前有开始后
+      endTime = endTime + data.value.planDto.afterStart * 60 * 1000;
+      console.log("1111333");
+    }
+    if (nowTime < endTime && nowTime > beginTime) {
+      state.isAllowSign = true;
+    } else {
+      state.isAllowSign = false;
+    }
+    // console.log(
+    //   "isAllowSign",
+    //   state.isAllowSign,
+    //   nowTime,
+    //   endTime,
+    //   beginTime,
+    //   nowTime < endTime,
+    //   nowTime > beginTime
+    // );
+  }, 1000);
+}
+isSignClick();
+
+//签到
+const signClick = () => {
+  if (data.value.signFlag) {
+    return;
+  }
+  // console.log(
+  //   "data.signFlag",
+  //   data.value.signFlag,
+  //   state.isAllowSign,
+  //   !state.isAllowSign
+  // );
+  if(data.value.planDto.beginTime){
+    let date1 = new Date(data.value.planDto.beginTime).getTime()
+    let date2 = new Date().getTime()
+    if(date1>date2){
+      ElMessage.info("面授课未开始");
+      return;
+    }
+  }
+  if (!state.isAllowSign) {
+    // console.log("data.signFlag", data.value.signFlag, isAllowSign);
+    ElMessage.info("未在签到范围内");
+    return;
+  }
+  2;
+  data.value.signFlag = 1;
+  ElMessage.info("签到成功");
+
+  if (taskId) {
+    request(TASK_OFFCOURSE_SIGN, { courseId: courseId, taskId, type });
+  } else {
+    request(TASK_OFFCOURSE_NOTASK_SIGN, { courseId: courseId });
+  }
+};
 
 function toSurvery() {
+  if (data.value.isSurvery) {
+    return;
+  }
+  if(data.value.planDto.beginTime){
+    let date1 = new Date(data.value.planDto.beginTime).getTime()
+    let date2 = new Date().getTime()
+    if(date1>date2){
+      ElMessage.info("面授课未开始");
+      return;
+    }
+  }
+  if (data.value.planDto.evalFlag == 0) {
+    ElMessage.info("此课程无评估");
+    return;
+  }
   router.push({
     path: "/surveydetail",
-    query: { courseId: data.value.planDto.evaluateId },
+    query: {
+      courseId: data.value.planDto.evaluateId,
+      pName: "面授课",
+      sName: data.value.planDto.name,
+    },
   });
 }
 
+function isEndSubMitWork() {
+  if(data.value.workDto.submitEndTime){
+    let date1 = new Date(data.value.workDto.submitEndTime).getTime();
+    let date2 = new Date().getTime();
+    console.log(date1, date2, date1>date2, data.value.workDto.submitEndTime)
+    if(date1<date2){
+      return true;
+    }
+  }else{
+    return false;
+  }
+}
+
 function toWork() {
+  if(data.value.planDto.beginTime){
+    let date1 = new Date(data.value.planDto.beginTime).getTime()
+    let date2 = new Date().getTime()
+    if(date1>date2){
+      ElMessage.info("面授课未开始");
+      return;
+    }
+  }
   router.push({
     path: "/homeworkpage",
     query: {
       courseId: data.value.workDto.workId,
-      id: data.value.offcourseDto.categoryId,
+      id: taskId,
       type,
+      pName: "面授课",
+      sName: data.value.planDto.name,
     },
   });
 }
 
 function toExamItem(obj) {
-  router.push({ path: "/starttest", query: { id: obj.courseId } });
+  if(data.value.planDto.beginTime){
+    let date1 = new Date(data.value.planDto.beginTime).getTime()
+    let date2 = new Date().getTime()
+    if(date1>date2){
+      ElMessage.info("面授课未开始");
+      return;
+    }
+  }
+  console.log("obj", obj.examinationTestId);
+  window.open(import.meta.env.VITE_BOE_EXAM_DETAIL_URL + obj.examinationTestId); //测评
+  // router.push({ path: import.meta.env.VITE_BOE_EXAM_DETAIL_URL+ obj.examinationTestId });
 }
+
+onUnmounted(() => {
+  if (timer) {
+    clearInterval(timer);
+  }
+});
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
@@ -254,7 +514,16 @@ function toExamItem(obj) {
       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/liveBroadcast/LiveBroadcast.vue

@@ -2,17 +2,28 @@
   <div class="moreactive" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
-      <div>混合制项目</div>
+      <div>{{ pName }}</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
-      <div>管理者进阶-腾飞班</div>
+      <div>{{ sName }}</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
       <div style="font-weight: 700; font-size: 16px">直播详情</div>
-
+      <!--
       <div class="preNext">
-        <button class="btn btn01"></button>
+         2022-12-15注释 李晓鸽  后面打开 -->
+      <!-- <button class="btn btn01"></button>
         <span class="content" style="margin-left: 6px">上一个</span>
         <span class="content" style="margin-left: 31px">下一个</span>
         <button class="btn btn02" style="margin-left: 6px"></button> 
+      </div>-->
+      <div 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>
     <!-- 面包屑导航 -->
@@ -26,16 +37,19 @@
             style="width: 15px; height: 17px"
             src="../../assets/image/time.png"
           />
-          <div style="margin-left: 8px">{{ data?.liveStartTime }}</div>
+          <div style="margin-left: 8px">
+            {{ data?.liveStartTime + "至" + data?.liveEndTime }}
+          </div>
         </div>
-        <div class="time" style="margin-top: 23px">
+        <!--          todo #直播详情 没有位置字段-->
+        <!-- <div class="time" style="margin-top: 23px">
           <img
-            style="width: 16px; height: 18px"
+              style="width: 16px; height: 18px"
-            src="../../assets/image/position.png"
+              src="../../assets/image/position.png"
           />
-          <!--          todo #直播详情 没有位置字段-->
+         
-          <div style="margin-left: 8px">大族广场</div>
+          <div style="margin-left: 8px">{{ data?.activityAddress }}</div>
-        </div>
+        </div> -->
       </div>
       <div class="threeBtn">
         <botton
@@ -46,13 +60,29 @@
         </botton>
         <botton
           class="btn"
-          style="background: rgb(57, 146, 249)"
+          :style="{
+            background: `${data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
+          }"
           @click="signClick"
-          v-if="!data.signFlag"
+          >{{ data.signFlag ? "已签到" : "签到" }}
-          >签到
         </botton>
-        <botton class="btn" @click="commitClick" v-if="!data.evalFlag"
+        <botton
-          >评估
+          style="background: #999"
+          class="btn"
+          @click="commitClick"
+          v-if="data.isEvaluate == 0"
+        >
+          评估
+        </botton>
+
+        <botton
+          :style="{
+            background: `${data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
+          }"
+          class="btn"
+          @click="commitClick"
+          v-if="data.isEvaluate && data.isEvaluate == 1"
+          >{{ data.isSurvery ? "已评估" : "评估" }}
         </botton>
       </div>
     </div>
@@ -68,40 +98,33 @@
                 style="width: 20px; height: 20px"
                 src="../../assets/image/course.png"
               />
-              <div class="text">课前预习</div>
+              <div class="text">直播说明</div>
               <div class="box"></div>
             </div>
             <div style="display: flex; align-items: center">
               <!--              todo #直播 没有课前预习字段-->
               <div class="content">
-                通过对各级人员的软件平台培训，使其能够了解如何运用乾元坤和智能信息管理系统来提升企业管理水平，最大限度发挥软件产品在企业中的作用;<br />
+                {{ data.liveExplain }}
-                ● 培训目标
-                <br />1.使企业不同部门人员掌握便捷、有效的系统平台操作方法;<br />
-                2.通过系统平台的培训提高员工对企业的管理理念认识与提升。<br />
-                3.通过系统平台培训加强沟通，统一部署，协同工作，提高效率。
-                <br />
-                ●培训对象<br />
-                集团领导、各相关部门领导、总经理、车间主管、车间操作员等;<br />
               </div>
             </div>
 
-            <div class="title">
+            <!--            <div class="title">-->
-              <img
+            <!--              <img-->
-                style="width: 20px; height: 20px"
+            <!--                  style="width: 20px; height: 20px"-->
-                src="../../assets/image/write.png"
+            <!--                  src="../../assets/image/write.png"-->
-              />
+            <!--              />-->
-              <!--              todo #直播 课后作业-->
+            <!--              &lt;!&ndash;              todo #直播 课后作业&ndash;&gt;-->
-              <div class="text">课后作业</div>
+            <!--              <div class="text">课后作业</div>-->
-              <div class="box"></div>
+            <!--              <div class="box"></div>-->
-            </div>
+            <!--            </div>-->
-            <div style="display: flex; align-items: center">
+            <!--            <div style="display: flex; align-items: center">-->
-              <div class="content">
+            <!--              <div class="content">-->
-                <span style="font-weight: 600"
+            <!--                <span style="font-weight: 600"-->
-                  >网易有道词典现有功能结构拆解+问题分析</span
+            <!--                >网易有道词典现有功能结构拆解+问题分析</span-->
-                ><br />
+            <!--                ><br/>-->
-                查找资料，介绍一种国外（日本、美国、欧洲）道路（公路、铁路、城市道路、地铁）设计规范的演变过程，可以一种或几种主要技术指标为例，并说明其原因。<br />
+            <!--                查找资料，介绍一种国外（日本、美国、欧洲）道路（公路、铁路、城市道路、地铁）设计规范的演变过程，可以一种或几种主要技术指标为例，并说明其原因。<br/>-->
-              </div>
+            <!--              </div>-->
-            </div>
+            <!--            </div>-->
           </div>
         </div>
       </div>
@@ -115,7 +138,7 @@
             <div class="text">直播公告</div>
             <div class="box"></div>
           </div>
-          <div class="content" v-html="data?.liveExplain"></div>
+          <div class="content" v-html="data?.liveNotice"></div>
         </div>
         <div class="teacher">
           <div class="title">
@@ -131,7 +154,7 @@
             class="teacheritem"
             :style="{ 'border-bottom': '1px solid rgba(56, 125, 247, 0.2)' }"
           >
-            <img class="peopleimg" :src="userAvatar" />
+            <img class="peopleimg" :src="teacherInfo.avatar" />
             <div style="margin-left: 17px; width: 190px">
               <div class="teacherName" style="margin-right: 5px">
                 {{ data.userInfoBo?.userName }}
@@ -155,15 +178,19 @@ import { TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN } from "@/api/api";
 import { useRoute } from "vue-router/dist/vue-router";
 import { useRouter } from "vue-router";
 import { useUserInfo } from "@/api/utils";
+import { ElMessage } from "element-plus";
 
 const {
-  query: { courseId: liveId },
+  query: { courseId: liveId, id: taskId, type, pName, sName },
 } = useRoute();
 const router = useRouter();
+const returnclick = () => {
+  router.back();
+};
 
 const { data } = useRequest(TASK_BROADCAST_DETAIL, { liveId });
 
-const { avatar: userAvatar } = useUserInfo(
+const teacherInfo = useUserInfo(
   computed(() => data.value.userInfoBo?.userId)
 );
 
@@ -181,13 +208,29 @@ const state = reactive({
 });
 const { activeName, teacher } = toRefs(state);
 const signClick = () => {
+  if (data.value.signFlag) {
+    return;
+  }
   data.value.signFlag = 1;
-  request(TASK_BROADCAST_SIGN, { courseId: liveId });
+  ElMessage.info("签到成功");
+  request(TASK_BROADCAST_SIGN, { courseId: liveId, taskId, type });
 };
 const commitClick = () => {
+  if (data.value.isSurvery) {
+    return;
+  }
+  if (data.value.isEvaluate == 0) {
+    ElMessage.info("此直播无评估");
+    return;
+  }
+
   router.push({
     path: "/surveydetail",
-    query: { courseId: data.value.assessmentId },
+    query: {
+      courseId: data.value.assessmentId,
+      pName: "直播",
+      sName: data.value.liveName,
+    },
   });
 };
 
@@ -206,7 +249,16 @@ function showClick() {
     line-height: 24px;
     position: relative;
   }
-
+  .return {
+    position: absolute;
+    right: 10%;
+    .text {
+      text-align: center;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+    }
+  }
   .preNext {
     position: absolute;
     right: 0px;
@@ -252,7 +304,6 @@ function showClick() {
     .threeBtn {
       display: flex;
       width: 490px;
-      justify-content: space-between;
       margin-right: 87px;
 
       .btn {
@@ -269,7 +320,7 @@ function showClick() {
         font-weight: 800;
         line-height: 24px;
         cursor: pointer;
-        // margin-right: 96px;
+        margin-left: 20px;
       }
     }
 

src/views/login/login.vue

@@ -46,6 +46,9 @@ import {setCookie} from "@/api/utils";
 import {request} from "@/api/request";
 
 const router = useRouter();
+const returnclick = () => {
+  router.back();
+};
 
 const form = ref({
   account: "10181457",

src/views/moreActive/MoreActive.vue

@@ -2,17 +2,27 @@
   <div class="moreactive" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
-      <div>混合制项目</div>
+      <div>{{ pName }}</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
-      <div>管理者进阶-腾飞班</div>
+      <div>{{ sName }}</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
       <div style="font-weight: 700; font-size: 16px">活动详情</div>
-
+      <!-- 
       <div class="preNext">
         <button class="btn btn01"></button>
         <span class="content" style="margin-left: 6px">上一个</span>
         <span class="content" style="margin-left: 31px">下一个</span>
         <button class="btn btn02" style="margin-left: 6px"></button>
+      </div>-->
+      <div 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>
     <!-- 面包屑导航 -->
@@ -28,7 +38,7 @@
             src="../../assets/image/time.png"
           />
           <div style="margin-left: 8px">
-            {{ data?.activityStartTime + "-" + data?.activityEndTime }}
+            {{ data?.activityStartTime + "至" + data?.activityEndTime }}
           </div>
         </div>
         <div class="time" style="margin-top: 23px">
@@ -39,7 +49,14 @@
           <div style="margin-left: 8px">{{ data?.activityAddress }}</div>
         </div>
       </div>
-      <div class="btn" v-if="!data.activityFlag" @click="signClick">签到</div>
+      <botton
+        class="btn"
+        :style="{
+          background: `${data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
+        }"
+        @click="signClick"
+        >{{ data.signFlag ? "已签到" : "签到" }}
+      </botton>
     </div>
     <!-- 基本信息 -->
 
@@ -58,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 + "分钟结束签到"
                       : "-"
                   }}
-                </div>
+                </span>
               </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>
@@ -128,19 +148,28 @@
 <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 },
+  query: { courseId: activityId, id: taskId, type, pName, sName },
 } = useRoute();
 
 const { data } = useRequest(ACTIVITY, { activityId });
-console.log("data", data);
 const signClick = (tab, event) => {
+  if (data.value.signFlag) {
+    return;
+  }
+  data.value.signFlag = true;
+  ElMessage.info("签到成功");
   request(TASK_ACTIVITY_SIGN, {
-    activitySubmitId: data.activityId,
+    courseId: activityId,
-    signInStatus: 1,
+    taskId,
-  }).then((res) => {
+    type,
-    data.value.activityFlag = 1;
   });
 };
 </script>
@@ -155,7 +184,16 @@ const signClick = (tab, event) => {
     line-height: 24px;
     position: relative;
   }
-
+  .return {
+    position: absolute;
+    right: 10%;
+    .text {
+      text-align: center;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+    }
+  }
   .preNext {
     position: absolute;
     right: 0px;
@@ -269,12 +307,14 @@ const signClick = (tab, event) => {
           left: 23px;
           top: 53px;
         }
+
         .activedetail {
           margin-top: 30px;
           font-size: 14px;
           font-weight: 500;
           color: #333330;
           line-height: 36px;
+
           .content {
             color: #677d86;
           }

src/views/project/ProjectManage.vue

@@ -0,0 +1,348 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-18 15:56:03
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-19 16:11:13
+ * @FilePath: /fe-stu/src/views/project/ProjectList.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div class="projectManage">
+    <div class="content">
+      <div class="title">我的项目</div>
+      <div class="search">
+        <!-- <el-select v-model="value" class="m-2" placeholder="Select">
+          <el-option
+            v-for="item in projectClassify"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+        <el-select v-model="value" class="m-2" placeholder="Select">
+          <el-option
+            v-for="item in studyProgress"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select> -->
+        <div style="width: 200px; margin-right: 20px">
+          <el-input v-model="projectname" placeholder="请输入项目名称" />
+        </div>
+        <div style="width: 420px">
+          <el-date-picker
+            v-model="searchTime"
+            type="datetimerange"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="selectTime"
+          />
+        </div>
+
+        <button
+          class="searchBtn"
+          @click="searchClick"
+          style="margin-left: 20px"
+        >
+          搜索
+        </button>
+        <button class="searchBtn" @click="resetClick">重置</button>
+      </div>
+      <div class="projectList" v-if="projectList.length==0" style="display:flex;color:#909399;">
+        <img
+            class="img2"
+            style="margin-left: 675px;margin-top: 165px;width:148px;height:220px;"
+            src="../../assets/image/notask.png"
+          />
+      </div>
+      <div v-else class="projectList" v-for="(i, k) in projectList" :key="k">
+        <div style="display: flex">
+          <img
+            style="width: 253px; height: 144px; border-radius: 4px"
+            :src="i.picUrl"
+          />
+          <div style="margin-left: 29px">
+            <div class="projectName" :title="i.name">
+              {{ i.name }}
+            </div>
+            <div class="progress">
+              <div class="progressNow">当前进度：</div>
+              <div style="width: 115px">
+                <el-progress
+                  :percentage="parseInt(i.finishTaskNum / i.totalTaskNum) * 100"
+                  :show-text="false"
+                  :stroke-width="8"
+                  color="rgba(255, 160, 80, 1)"
+                />
+              </div>
+              <div class="progressNum">
+                {{
+                  i.finishTaskNum && i.totalTaskNum
+                    ? parseInt(i.finishTaskNum / i.totalTaskNum) * 100
+                    : 0
+                }}%
+              </div>
+            </div>
+            <div class="studyNew">最新一次学习时间：{{ i.lastStudyTime }}</div>
+          </div>
+        </div>
+        <div
+          class="tobestarted"
+          v-if="i.status == 2"
+          @click="goProjectDetails(i)"
+        >
+          待开始
+        </div>
+        <div class="gostudy" v-if="i.status == 0" @click="goProjectDetails(i)">
+          去学习
+        </div>
+        <div class="finish" v-if="i.status == 1" @click="goProjectDetails(i)">
+          已完成
+        </div>
+        <div
+          class="tobestarted"
+          v-if="i.status == 3"
+          @click="goProjectDetails(i)"
+        >
+          已结束
+        </div>
+      </div>
+      <!-- <div
+        style="display: flex; justify-content: center; margin-top: 30px"
+        v-if="projectTotal > 10"
+      >
+        <div class="demo-pagination-block">
+          <el-pagination
+            v-model:current-page="currentPage"
+            :page-size="pageSize"
+            :small="small"
+            layout="prev, pager, next, jumper"
+            :total="projectTotal"
+            @current-change="handleCurrentChange"
+          />
+        </div>
+      </div> -->
+    </div>
+  </div>
+</template>
+<script setup>
+import { reactive, toRefs, ref, onMounted, computed } from "vue";
+
+import { boeRequest, request, usePage, useRequest } from "@/api/request";
+import {
+  ROUTER_CHAPTER_LIST,
+  PROJECT_LIST,
+  ROUTER_UNCOMPLETE_LIST,
+} from "@/api/api";
+
+import { useRouter } from "vue-router";
+import store from "@/store";
+import { toDate } from "../../api/method";
+const projectClassify = [];
+const studyProgress = [];
+const projectList = ref([]); //项目列表
+const pageSize = ref(60); //每页条数
+const currentPage = ref(1); //当前页数
+const projectTotal = ref(""); //项目总数
+const projectname = ref(""); //项目名称
+const searchTime = ref(""); //选择时间
+const beginTime = ref(""); //结束时间
+const endTime = ref(""); //开始时间
+
+const userInfo = computed(() => store.state.userInfo);
+
+//获取项目列表--------start------------------------------------
+const getProject = () => {
+  request(PROJECT_LIST, {
+    beginTime: beginTime.value,
+    endTime: endTime.value,
+    key: projectname.value,
+    pageNo: currentPage.value,
+    pageSize: pageSize.value,
+  })
+    .then((res) => {
+      console.log("获取成功", res);
+      if (res.code === 200) {
+        projectList.value = res.data.rows;
+        projectTotal.value = Number(res.data.total);
+        console.log("projectTotal.value", projectTotal.value);
+      }
+    })
+    .catch((err) => {
+      console.log("获取失败", err);
+    });
+};
+getProject();
+
+//获取项目列表--------end------------------------------------
+//搜索--------------start-----------------------------------------
+
+//搜索
+const searchClick = () => {
+  console.log("点击搜索", projectname.value, searchTime.value);
+
+  if (searchTime.value) {
+    beginTime.value = toDate(
+      new Date(searchTime.value[0]).getTime() / 1000,
+      "Y-M-D h:m:s"
+    );
+    endTime.value = toDate(
+      new Date(searchTime.value[1]).getTime() / 1000,
+      "Y-M-D h:m:s"
+    );
+  }
+  console.log("beginTime", beginTime.value, endTime.value);
+  getProject();
+};
+//重置
+const resetClick = () => {
+  searchTime.value = "";
+  projectname.value = "";
+  currentPage.value = 1;
+  beginTime.value = "";
+  endTime.value = "";
+  getProject();
+  console.log("点击重置");
+};
+//搜索--------------end-----------------------------------------
+const router = useRouter();
+const goProjectDetails = (value) => {
+  router.push({
+    path: "/projectdetails",
+    query: { projectId: value.projectId },
+  });
+};
+</script>
+<style lang="scss">
+.projectManage {
+  width: 100%;
+  min-height: 800px;
+  //border-radius: 8px;
+  background-color: rgba(255, 255, 255, 1);
+  display: flex;
+  // background-color: #ccc;
+  .content {
+    width: 100%;
+    // flex: 1;
+    margin-top: 50px;
+    margin-left: 81px;
+    .title {
+      font-size: 18px;
+      font-weight: 600;
+      color: #333333;
+      line-height: 25px;
+    }
+    .search {
+      margin-top: 31px;
+      display: flex;
+      align-items: center;
+      .searchBtn {
+        width: 100px;
+        height: 35px;
+        border-radius: 8px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        background: #387df7;
+        border: 1px solid #387df7;
+        color: #ffffff;
+        cursor: pointer;
+        margin-left: 10px;
+      }
+    }
+    .projectList {
+      margin-top: 40px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      overflow-x: auto;
+      .projectName {
+        width: 270px;
+        margin-top: 12px;
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        margin-bottom: 40px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+      .progress {
+        display: flex;
+        align-items: center;
+        .el-progress-bar__outer {
+          background-color: rgba(255, 160, 80, 0.19);
+        }
+        .progressNow {
+          font-size: 14px;
+          font-weight: 400;
+          color: #333333;
+          line-height: 20px;
+          margin-right: 20px;
+        }
+        .progressNum {
+          font-size: 12px;
+          font-weight: 400;
+          color: #999999;
+          line-height: 17px;
+          margin-left: 26px;
+        }
+      }
+      .studyNew {
+        margin-top: 16px;
+        font-size: 14px;
+        font-weight: 400;
+        color: #999999;
+        line-height: 20px;
+      }
+      .tobestarted {
+        width: 140px;
+        height: 40px;
+        border-radius: 4px;
+        border: 1px solid #387df7;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 16px;
+        font-weight: 400;
+        color: #387df7;
+        line-height: 22px;
+        cursor: pointer;
+        margin-right: 120px;
+      }
+      .gostudy {
+        width: 140px;
+        height: 40px;
+        background: #387df7;
+        box-shadow: 1px 2px 15px 1px rgba(56, 125, 247, 0.34);
+        border-radius: 4px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 16px;
+        font-weight: 400;
+        color: #ffffff;
+        line-height: 22px;
+        margin-right: 120px;
+        cursor: pointer;
+      }
+      .finish {
+        width: 140px;
+        height: 40px;
+        background: rgba(56, 125, 247, 0.6);
+        border-radius: 4px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 16px;
+        font-weight: 400;
+        color: #ffffff;
+        line-height: 22px;
+        cursor: pointer;
+      }
+    }
+  }
+}
+</style>

src/views/roadmap/LearnPath.vue

@@ -1,353 +1,323 @@
 <template>
-  <div class="learnpath">
+	<div class="learnpath">
-    <div class="content">
+		<div class="content">
-      <div class="title">
+			<div class="title">
-        <div class="titleL">
+				<div class="titleL">
-          <div @click="returnfun" class="text">学习路径图</div>
+					<div @click="returnfun" class="text">学习路径图</div>
-          <div class="info" style="margin-right: 14px" v-if="useInfo.jobName">
+					<div class="info" style="margin-right: 14px" v-if="userInfo.jobName">
-            <img
+						<img style="width: 20px; height: 18px; margin-right: 10px" src="../../assets/image/pm.png" />
-                style="width: 20px; height: 18px; margin-right: 10px"
+						<div style="margin-top: 1px">{{ userInfo.jobName }}</div>
-                src="../../assets/image/pm.png"
+					</div>
-            />
+					<div class="info" v-if="userInfo.bandDesc">
-            <div style="margin-top: 1px">{{ useInfo.jobName }}</div>
+						<img style="width: 18px; height: 17px; margin-right: 11px" src="../../assets/image/band.png" />
-          </div>
+						<div style="margin-top: 2px">{{ userInfo.bandDesc }}</div>
-          <div class="info" v-if="useInfo.bandDesc">
+					</div>
-            <img
+				</div>
-                style="width: 18px; height: 17px; margin-right: 11px"
+				<div :style="{ display: !showmapdetail ? 'flex' : 'none' }">
-                src="../../assets/image/band.png"
+					<!--          <el-popover width="475px" trigger="hover" popper-class="lppopover">-->
-            />
+					<!--            <div>-->
-            <div style="margin-top: 2px">{{ useInfo.bandDesc }}</div>
+					<!--              <div class="finish">-->
-          </div>
+					<!--                <img-->
-        </div>
+					<!--                    src="../../assets/image/circle.png"-->
-        <div :style="{ display: !showmapdetail ? 'flex' : 'none' }">
+					<!--                    style="width: 20px; height: 20px"-->
-<!--          <el-popover width="475px" trigger="hover" popper-class="lppopover">-->
+					<!--                />-->
-<!--            <div>-->
+					<!--                <div class="text">未完成</div>-->
-<!--              <div class="finish">-->
+					<!--                <div class="box"></div>-->
-<!--                <img-->
+					<!--              </div>-->
-<!--                    src="../../assets/image/circle.png"-->
+					<!--              <div-->
-<!--                    style="width: 20px; height: 20px"-->
+					<!--                  v-for="(value, index) in unCompleteTaskList"-->
-<!--                />-->
+					<!--                  :key="index"-->
-<!--                <div class="text">未完成</div>-->
+					<!--                  class="tasks"-->
-<!--                <div class="box"></div>-->
+					<!--                  :style="{-->
-<!--              </div>-->
+					<!--                  'border-bottom':-->
-<!--              <div-->
+					<!--                    index === unCompleteTaskList.length - 1-->
-<!--                  v-for="(value, index) in unCompleteTaskList"-->
+					<!--                      ? null-->
-<!--                  :key="index"-->
+					<!--                      : '1px solid rgba(229, 228, 228, 1)',-->
-<!--                  class="tasks"-->
+					<!--                }"-->
-<!--                  :style="{-->
+					<!--              >-->
-<!--                  'border-bottom':-->
+					<!--                <div style="font-size: 14px; font-weight: 500; color: #677d86">-->
-<!--                    index === unCompleteTaskList.length - 1-->
+					<!--                  {{ value.name }}-->
-<!--                      ? null-->
+					<!--                </div>-->
-<!--                      : '1px solid rgba(229, 228, 228, 1)',-->
+					<!--                <img-->
-<!--                }"-->
+					<!--                    style="width: 20px; height: 20px"-->
-<!--              >-->
+					<!--                    src="../../assets/image/go.png"-->
-<!--                <div style="font-size: 14px; font-weight: 500; color: #677d86">-->
+					<!--                    @click="toUnTask(chapterId)"-->
-<!--                  {{ value.name }}-->
+					<!--                />-->
-<!--                </div>-->
+					<!--              </div>-->
-<!--                <img-->
+					<!--            </div>-->
-<!--                    style="width: 20px; height: 20px"-->
+					<!--            <template #reference>-->
-<!--                    src="../../assets/image/go.png"-->
+					<!--              todo #学习路径 只会有一个未完成任务么?是否是直接跳到任务详情-->
-<!--                    @click="toUnTask(chapterId)"-->
+					<!--              <div class="titleR">进入未完成任务</div>-->
-<!--                />-->
+					<!--            </template>-->
-<!--              </div>-->
+					<!--          </el-popover>-->
-<!--            </div>-->
+				</div>
-<!--            <template #reference>-->
+				<div :style="{ display: showmapdetail ? 'flex' : 'none' }" class="titleR" @click="returnfun">
-              <!--              todo #学习路径 只会有一个未完成任务么?是否是直接跳到任务详情-->
+					返回列表
-<!--              <div class="titleR">进入未完成任务</div>-->
+				</div>
-<!--            </template>-->
+			</div>
-<!--          </el-popover>-->
+			<!-- 路径列表-->
-        </div>
+			<div :style="{ display: !showmapdetail ? 'flex' : 'none' }" class="head">
-        <div
+				<div style="min-width: 770px; width: 100%">
-            :style="{ display: showmapdetail ? 'flex' : 'none' }"
+					<el-table :data="data" style="width: 100%" @row-click="gofun">
-            class="titleR"
+						<el-table-column prop="img" label="缩略图" #default="scope" align="center" width="255">
-            @click="returnfun"
+							<img :src="scope.row.picUrl" style="width: 230px; height: 155px" />
-        >
+						</el-table-column>
-          返回列表
+						<el-table-column align="center" prop="name" label="路径名称" />
-        </div>
+						<el-table-column align="center" prop="introduce" label="路径介绍" #default="scope">
-      </div>
+							<el-popover placement="bottom-start"   :width="400"  title="路径介绍" trigger="hover" :content="scope.row.remark">
-      <!-- 路径列表-->
+								<template #reference>
-      <div :style="{ display: !showmapdetail ? 'flex' : 'none' }" class="head">
+									<div>{{ scope.row.remark }}</div>
-        <div style="min-width: 770px; width: 100%">
+								</template>
-          <el-table :data="data" style="width: 100%" @row-click="gofun">
+							</el-popover>
-            <el-table-column
+						</el-table-column>
-                prop="img"
-                label="缩略图"
-                #default="scope"
-                align="center"
-                width="255"
-            >
-              <img
-                  :src="scope.row.picUrl"
-                  style="width: 230px; height: 155px"
-              />
-            </el-table-column>
-            <el-table-column align="center" prop="name" label="路径名称"/>
-            <el-table-column
-                align="center"
-                prop="introduce"
-                label="路径介绍"
-                #default="scope"
-            >
-              <el-popover
-                  placement="top-start"
-                  title="路径介绍"
-                  trigger="hover"
-                  :content="scope.row.remark"
-              >
-                <template #reference>
-                  <div>{{ scope.row.remark }}</div>
-                </template>
-              </el-popover>
-            </el-table-column>
 
-            <el-table-column
+						<el-table-column align="center" prop="organizationName" label="归属组织" />
-                align="center"
+						<el-table-column #default="scope" align="center" :width="150" prop="state" label="状态">
-                prop="organizationName"
+							<img :src="
-                label="归属组织"
+								scope.row.taskStatus === 1
-            />
+									? ongoing
-            <el-table-column
+									: scope.row.taskStatus === 2
-                #default="scope"
+										? completed
-                align="center"
+										: scope.row.taskStatus === 0
-                :width="150"
+											? nostarted
-                prop="state"
+											: null
-                label="状态"
+							" style="width: 99px; height: 99px" />
-            >
+						</el-table-column>
-              <img
+					</el-table>
-                  :src="
+				</div>
-                  { 0: nostarted, 1: completed, 2: ongoing }[scope.row.status]
+			</div>
-                "
+
-                  style="width: 99px; height: 99px"
+			<!--      :src="{ 0: nostarted, 1: completed, 2: ongoing }[scope.row.status]"-->
-              />
+			<!-- 路径列表-->
-            </el-table-column>
+			<!-- 路径详情图 -->
-          </el-table>
+			<div :style="{ display: showmapdetail ? 'flex' : 'none' }" class="mapdetail">
-        </div>
+				<div v-for="(item, i) in detail?.rows" :key="i">
-      </div>
+					<img :src="useImage(`222_0${i + 2}.png`)" />
-      <!-- 路径列表-->
+				</div>
-      <!-- 路径详情图 -->
+				<!--        <div class="modal"-->
-      <div
+				<!--             style="width: calc(100% - 168px); height: 525px;background-image: url('../../src/assets/image/mapdetail.png');background-size: 100%;background-repeat: no-repeat;">-->
-          :style="{ display: showmapdetail ? 'flex' : 'none' }"
+				<!--        </div>-->
-          class="mapdetail"
+			</div>
-      >
+			<!-- 路径详情图 -->
-        <div v-for="(item, i) in detail?.rows" :key="i">
+		</div>
-          <img :src="useImage(`222_0${i + 2}.png`)"/>
+	</div>
-        </div>
-        <!--        <div class="modal"-->
-        <!--             style="width: calc(100% - 168px); height: 525px;background-image: url('../../src/assets/image/mapdetail.png');background-size: 100%;background-repeat: no-repeat;">-->
-        <!--        </div>-->
-      </div>
-      <!-- 路径详情图 -->
-    </div>
-  </div>
 </template>
 <script setup>
-import {reactive, toRefs, ref, onMounted} from "vue";
+import { reactive, toRefs, ref, onMounted, computed } from "vue";
 import nostarted from "../../assets/image/nostarted.png";
 import completed from "../../assets/image/completed.png";
 import ongoing from "../../assets/image/ongoing.png";
-import {boeRequest, request, usePage, useRequest} from "@/api/request";
+import { boeRequest, request, usePage, useRequest } from "@/api/request";
 import {
-  BASE_URL,
+	ROUTER_CHAPTER_LIST,
-  ROUTER_CHAPTER_LIST,
+	ROUTER_LIST,
-  ROUTER_LIST,
+	ROUTER_UNCOMPLETE_LIST,
-  ROUTER_UNCOMPLETE_LIST,
 } from "@/api/api";
-import {useImage} from "@/api/utils";
+import { useImage } from "@/api/utils";
-import {useRouter} from "vue-router";
+import { useRouter } from "vue-router";
-import {GET_USER_INFO} from "@/api/ThirdApi";
+import store from "@/store";
 
 const detail = ref();
-const useInfo = ref({});
+const userInfo = computed(() => store.state.userInfo);
-const {data} = usePage(ROUTER_LIST, {});
+const { data } = usePage(ROUTER_LIST, { pageSize: 60 });
-
+console.log("datadata", data);
 const router = useRouter();
+const returnclick = () => {
+	router.back();
+};
 
 // const {unCompleteTaskList} = useRequest(ROUTER_UNCOMPLETE_LIST, {});
 
-onMounted(()=>{
-  boeRequest(GET_USER_INFO).then(res=>{
-    useInfo.value=res.result
-  })
-})
-
 const state = reactive({
-  showmapdetail: false,
+	showmapdetail: false,
 });
-const {showmapdetail} = toRefs(state);
+const { showmapdetail } = toRefs(state);
 
 const returnfun = () => {
-  state.showmapdetail = false;
+	state.showmapdetail = false;
 };
 
-async function gofun({routerId}) {
+async function gofun({ routerId, name: routerName }) {
-  // console.log(routerId)
+	// console.log(routerId)
-  // const data = await request(ROUTER_CHAPTER_LIST, {stuChapterListVo: {routerId}})
+	// const data = await request(ROUTER_CHAPTER_LIST, {stuChapterListVo: {routerId}})
-  // detail.value = data.data
+	// detail.value = data.data
-  // state.showmapdetail = true;
+	// state.showmapdetail = true;
-  // router.push({path: "/pathdetails", query: {routerId}});
+	// router.push({path: "/pathdetails", query: {routerId}});
-  import.meta.env.DEV ? router.push({
+	import.meta.env.MODE === "development"
-    path: "/pathdetails",
+		? router.push({
-    query: {routerId}
+			path: "/pathdetails",
-  }) : window.parent.location.href = `http://u-pre.boe.com/pc/forward?to=/fe-student/pathdetails&params=${encodeURIComponent(`routerId=${routerId}`)}`
+			query: { routerId, routerName },
-}
+		})
-
+		: window.open(
-function toUnTask() {
+			`http://u-pre.boe.com/pc/forward?to=/fe-student/pathdetails&params=${encodeURIComponent(
+				`routerId=${routerId}&routerName=${routerName}`
+			)}`
+		);
 }
+function toUnTask() { }
 </script>
 <style lang="scss">
-
+#app div:nth-child(1) {
-.modal {
+	// background: rgba(0, 0, 0, 0) !important;
 }
 
+.modal {}
+
 .modal:after {
-  content: "";
+	content: "";
 }
 
 .learnpath {
-  width: 100%;
+	width: 100%;
-  min-height: 800px;
+	min-height: 800px;
-  //border-radius: 8px;
+	//border-radius: 8px;
-  background-color: rgba(255, 255, 255, 1);
+	background-color: rgba(255, 255, 255, 1);
-  display: flex;
+	display: flex;
 
-  .content {
+	.content {
-    width: 100%;
+		width: 100%;
-    // flex: 1;
+		// flex: 1;
-    margin-top: 43px;
+		margin-top: 43px;
-    // background-color: pink;
-    .title {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-left: 53px;
-      margin-right: 54px;
-    }
 
-    .title .titleL {
+		// background-color: pink;
-      display: flex;
+		.title {
-      align-items: center;
+			display: flex;
-    }
+			justify-content: space-between;
+			align-items: center;
+			margin-left: 53px;
+			margin-right: 54px;
+		}
 
-    .title .titleL .text {
+		.title .titleL {
-      font-size: 18px;
+			display: flex;
-      font-weight: bold;
+			align-items: center;
-      color: #333333;
+		}
-      line-height: 24px;
-      margin-right: 26px;
-    }
 
-    .title .titleL .info {
+		.title .titleL .text {
-      display: flex;
+			font-size: 18px;
-      // align-items: center;
+			font-weight: bold;
-      font-size: 14px;
+			color: #333333;
-      font-weight: 400;
+			line-height: 24px;
-      color: #387df7;
+			margin-right: 26px;
-    }
+		}
 
-    .title .titleR {
+		.title .titleL .info {
-      width: 157px;
+			display: flex;
-      height: 48px;
+			// align-items: center;
-      border: 2px solid #0060ff;
+			font-size: 14px;
-      border-radius: 8px;
+			font-weight: 400;
-      display: flex;
+			color: #387df7;
-      align-items: center;
+		}
-      justify-content: center;
-      cursor: pointer;
-      font-size: 16px;
-      font-weight: bold;
-      color: #0060ff;
-    }
 
-    .head {
+		.title .titleR {
-      // height: 50px;
+			width: 157px;
-      background: #f9f9f9;
+			height: 48px;
-      margin-top: 50px;
+			border: 2px solid #0060ff;
-      display: flex;
+			border-radius: 8px;
-      justify-content: space-between;
+			display: flex;
-      align-items: center;
+			align-items: center;
-      font-size: 14px;
+			justify-content: center;
-      font-weight: 500;
+			cursor: pointer;
-      color: #333333;
+			font-size: 16px;
-      margin-left: 53px;
+			font-weight: bold;
-      margin-right: 54px;
+			color: #0060ff;
-      width: calc(100% - 107px);
+		}
-      // min-width: 770px;
-      overflow-x: scroll;
 
-      .el-table th.el-table__cell {
+		.head {
-        background: rgba(249, 249, 249, 1);
+			// height: 50px;
-        color: rgba(51, 51, 51, 1);
+			background: #f9f9f9;
-        font-size: 14px;
+			margin-top: 50px;
-        font-weight: 500;
+			display: flex;
-      }
+			justify-content: space-between;
+			align-items: center;
+			font-size: 14px;
+			font-weight: 500;
+			color: #333333;
+			margin-left: 53px;
+			margin-right: 54px;
+			width: calc(100% - 107px);
+			// min-width: 770px;
+			overflow-x: auto;
 
-      .el-table .cell {
+			.el-table th.el-table__cell {
-        overflow: hidden;
+				background: rgba(249, 249, 249, 1);
-        text-overflow: ellipsis;
+				color: rgba(51, 51, 51, 1);
-        width: 100%;
+				font-size: 14px;
-        display: -webkit-box;
+				font-weight: 500;
-        -webkit-box-orient: vertical;
+			}
-        -webkit-line-clamp: 3;
-        word-break: break-all;
-      }
 
-      .el-table__row {
+			.el-table .cell {
-        height: 231px;
+				overflow: hidden;
-        font-size: 14px;
+				text-overflow: ellipsis;
-        color: rgba(102, 102, 102, 1);
+				width: 100%;
-        font-weight: 500;
+				display: -webkit-box;
-      }
+				-webkit-box-orient: vertical;
-    }
+				-webkit-line-clamp: 3;
+				word-break: break-all;
+			}
 
-    .mapdetail {
+			.el-table__row {
-      width: calc(100% - 107px);
+				height: 231px;
-      height: 577px;
+				font-size: 14px;
-      background: rgba(242, 245, 247, 0.6);
+				color: rgba(102, 102, 102, 1);
-      margin-top: 26px;
+				font-weight: 500;
-      border-radius: 8px;
+			}
-      margin-left: 53px;
+		}
-      margin-right: 54px;
+
-      display: flex;
+		.mapdetail {
-      align-items: center;
+			width: calc(100% - 107px);
-      justify-content: center;
+			height: 577px;
-    }
+			background: rgba(242, 245, 247, 0.6);
-  }
+			margin-top: 26px;
+			border-radius: 8px;
+			margin-left: 53px;
+			margin-right: 54px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
 }
 
 .lppopover {
-  .finish {
+	.finish {
-    padding-left: 27px;
+		padding-left: 27px;
-    padding-right: 18px;
+		padding-right: 18px;
-    margin-top: 15px;
+		margin-top: 15px;
-    margin-bottom: 17px;
+		margin-bottom: 17px;
-    position: relative;
+		position: relative;
-    display: flex;
+		display: flex;
-    align-items: center;
+		align-items: center;
-  }
+	}
 
-  .text {
+	.text {
-    font-size: 16px;
+		font-size: 16px;
-    font-weight: 800;
+		font-weight: 800;
-    color: #333333;
+		color: #333333;
-    margin-left: 8px;
+		margin-left: 8px;
-  }
+	}
 
-  .box {
+	.box {
-    width: 59px;
+		width: 59px;
-    height: 10px;
+		height: 10px;
-    background-color: rgba(36, 120, 255, 0.15);
+		background-color: rgba(36, 120, 255, 0.15);
-    position: absolute;
+		position: absolute;
-    left: 50px;
+		left: 50px;
-    top: 15px;
+		top: 15px;
-  }
+	}
 
-  .tasks {
+	.tasks {
-    width: 405px;
+		width: 405px;
-    height: 52px;
+		height: 52px;
-    display: flex;
+		display: flex;
-    align-items: center;
+		align-items: center;
-    justify-content: space-between;
+		justify-content: space-between;
-    margin-left: 28px;
+		margin-left: 28px;
-    cursor: pointer;
+		cursor: pointer;
-  }
+	}
+  .box-item {
+  width: 200px;
+  margin-top: 10px;
+}
 }
 </style>

src/views/roadmap/PathDetails.vue

@@ -2,48 +2,57 @@
   <div class="pathdetails" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
-      <div>产品经理学习路径图</div>
+      <div>{{ routerName }}</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
       <div style="font-weight: 700">路径图详情</div>
     </div>
     <!-- 面包屑导航 -->
-    <div class="pdname">中级产品经理</div>
+    <div class="pdname">
+      {{ userInfo.bandDesc }}
+      <span @click="introductionPro"  style="font-size:14px;color:#fff;margin-left: 33px;cursor: pointer;">简介
+				<span style="position: relative;top:1px;left:-3px;cursor: pointer;">></span>
+			</span>
+    </div>
     <!-- 详细信息 -->
     <div class="detailinfo">
       <div class="detailL">
-        <div v-for="(i, k) in data.chapterProcessList" :key="k">
+        <div>
           <div class="title">
-            <div class="titleL">{{ i.chapterName }}</div>
+            <div class="titleL">{{ data.currentStageName }}</div>
-            <div
+            <div class="titleR" :style="{ display: 'flex' }">
-                class="titleR"
+              <img
-                :style="{ display: 'flex' }"
+                  :src="data.currentChapterCnt?circle:circle2"/>
-            >
+              <div class="titleRT" :style="{color:data.currentChapterCnt?'':'rgba(102, 102, 102, 1)'}">
-              <img src="../../assets/image/pathdetails/circle.png"/>
+                {{ data.currentChapterCnt ? '进行中' : '未开始' }}
-              <div class="titleRT">进行中</div>
-            </div>
-            <div
-                class="titleR"
-                :style="{ display: i.status === 2 ? 'flex' : 'none' }"
-            >
-              <img src="../../assets/image/pathdetails/circle2.png"/>
-              <div class="titleRT" style="color: rgba(102, 102, 102, 1)">
-                未开始
               </div>
             </div>
           </div>
           <div
               class="course"
-              v-for="(value, index) in i.taskProcessList"
+              v-for="(value, index) in data.taskBoList?.filter(
+              (e) => !whiteTypes(e.type)
+            )"
               :key="index"
           >
-            <div>
+            <div style="width: 70%">
-              <div class="coursename">{{ value.name }}</div>
+              <div class="coursename" :title="value.name">{{ value.name }}</div>
               <div class="coursetag">
-                <div class="tag1" style="margin-right: 11px; margin-top: 16px" v-if="value.flag">必修</div>
+                <div
-                <div class="tag2" style="margin-right: 11px; margin-top: 16px" v-if="!value.flag">选修</div>
+                    class="tag1"
-                <div class="tag3" style="margin-right: 11px; margin-top: 16px">{{
+                    style="margin-right: 11px; margin-top: 16px"
-                    types.typeName[value.type] || ''
+                    v-if="value.flag"
-                  }}
+                >
+                  必修
+                </div>
+                <div
+                    class="tag2"
+                    style="margin-right: 11px; margin-top: 16px"
+                    v-if="!value.flag"
+                >
+                  选修
+                </div>
+                <div class="tag3" style="margin-right: 11px; margin-top: 16px">
+                  {{ types.typeName[value.type] || "" }}
                 </div>
 
                 <!--                                <div-->
@@ -57,7 +66,7 @@
               </div>
               <div
                   class="progressBox"
-                  :style="{ display: value.status === 1 ? 'block' : 'none' }"
+                  :style="{ display: value.type === 1 ? 'block' : 'none' }"
               >
                 <div>当前进度</div>
                 <div class="progress">
@@ -68,13 +77,13 @@
                         :stroke-width="8"
                         :color="
                         {
-                          0:'rgba(238, 112, 108, 1)',
+                          0: 'rgba(238, 112, 108, 1)',
-                          1:'rgba(255, 151, 38, 1)',
+                          1: 'rgba(255, 151, 38, 1)',
-                          2:'rgba(39, 122, 255, 1)',
+                          2: 'rgba(39, 122, 255, 1)',
-                          3:'rgba(59, 94, 251, 1)',
+                          3: 'rgba(59, 94, 251, 1)',
-                          4:'rgba(57, 219, 183, 1)',
+                          4: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                          5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(value.currentRatio/20)]
+                        }[parseInt(value.currentRatio / 20)]
                       "
                     />
                   </div>
@@ -86,15 +95,14 @@
                       margin-left: 10px;
                     "
                       :style="{
-                      color:
+                      color: {
-                        {
+                        0: 'rgba(238, 112, 108, 1)',
-                          0:'rgba(238, 112, 108, 1)',
+                        1: 'rgba(255, 151, 38, 1)',
-                          1:'rgba(255, 151, 38, 1)',
+                        2: 'rgba(39, 122, 255, 1)',
-                          2:'rgba(39, 122, 255, 1)',
+                        3: 'rgba(59, 94, 251, 1)',
-                          3:'rgba(59, 94, 251, 1)',
+                        4: 'rgba(57, 219, 183, 1)',
-                          4:'rgba(57, 219, 183, 1)',
+                        5: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                      }[parseInt(value.currentRatio / 20)],
-                        }[parseInt(value.currentRatio/20)]
                     }"
                   >
                     {{ value.currentRatio }}%
@@ -102,10 +110,19 @@
                 </div>
               </div>
             </div>
-            <div class="goclass" :style="{background:`${types.path[value.type]?'#2478ff':'#999'}`}"
+            <div
-                 @click="toFinish(value)">
+                class="goclass"
+                :style="{
+                background: `${types.path[value.type] ? '#2478ff' : '#999'}`,
+              }"
+                @click="toFinish(value)"
+            >
               {{
-                types.path[value.type] ? types.toName[value.type] : '未开放'
+                value.status === 1
+                    ? "已完成"
+                    : types.path[value.type]
+                        ? types.toName[value.type]
+                        : "未开放"
               }}
             </div>
             <!--            <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
@@ -133,37 +150,33 @@
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="课程公告" name="first">
               <div class="notice">
-                请各位选课的同学提前阅读本课程的
+                {{ data.remark || "暂无公告" }}
-                “教学大纲与计划”“课程考核要求”与“学习要求”
-                ，并按给定的中学化学教学主题分好小组 <br/>
-                每位同学在网上学习的活动轨迹都会自动被系统记录将作为大家个人线上参与的评价依据；<br/>
-                请大家务必在规定的时间内提交作业，否则会被系统自动记录为“迟交”或“未交”则会影响线上参与的平时成
-                绩；<br/>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="共享文档" name="second">
-              <div style="padding: 19px 30px 17px 28px">
-                <div
-                    v-for="(value, index) in sharedoc"
-                    :key="index"
-                    style="
-                    display: flex;
-                    align-items: center;
-                    margin-bottom: 15px;
-                  "
-                >
-                  <img :src="value.img" style="width: 22px; height: 26px"/>
-                  <div class="sharedocname">{{ value.name }}</div>
-                  <div class="download">
-                    <img
-                        src="../../assets/image/download.png"
-                        style="width: 16px; height: 15px"
-                    />
-                    <div style="margin-left: 7px">下载</div>
-                  </div>
-                </div>
               </div>
             </el-tab-pane>
+            <!--
+            <el-tab-pane label="共享文档" name="second">    -->
+            <!--              <div style="padding: 19px 30px 17px 28px">-->
+            <!--                <div-->
+            <!--                    v-for="(value, index) in sharedoc"-->
+            <!--                    :key="index"-->
+            <!--                    style="-->
+            <!--                    display: flex;-->
+            <!--                    align-items: center;-->
+            <!--                    margin-bottom: 15px;-->
+            <!--                  "-->
+            <!--                >-->
+            <!--                  <img :src="value.img" style="width: 22px; height: 26px"/>-->
+            <!--                  <div class="sharedocname">{{ value.name }}</div>-->
+            <!--                  <div class="download">-->
+            <!--                    <img-->
+            <!--                        src="../../assets/image/download.png"-->
+            <!--                        style="width: 16px; height: 15px"-->
+            <!--                    />-->
+            <!--                    <div style="margin-left: 7px">下载</div>-->
+            <!--                  </div>-->
+            <!--                </div>-->
+            <!--              </div>-->
+            <!--   </el-tab-pane>-->
           </el-tabs>
         </div>
         <!-- 课程公告及共享文档 -->
@@ -181,17 +194,19 @@
             <!--            todo #路径详情 个人信息缺少img和介绍-->
             <div
                 class="teacheritem"
-                :style="{'border-bottom': '1px solid rgba(56, 125, 247, 0.2)'}"
+                :style="{ 'border-bottom': '1px solid rgba(56, 125, 247, 0.2)' }"
             >
-              <img class="peopleimg" :src="userAvatar"/>
+              <img class="peopleimg" :src="userInfo.avatar"/>
               <div style="margin-left: 17px">
                 <div class="teacherName">
-                  <div style="margin-right: 5px">{{ data.userInfoBo?.userName }}</div>
+                  <div style="margin-right: 5px">
-                  <div v-for="(item, key) in data.userInfoBo?.medal" :key="key">
+                    {{ userInfo?.realName }}
-                    <img class="teacherMedal" :src="item"/>
                   </div>
+                  <!--                  <div v-for="(item, key) in data.userInfoBo?.medal" :key="key">-->
+                  <!--                    <img class="teacherMedal" :src="item"/>-->
+                  <!--                  </div>-->
                 </div>
-                <div class="introduce">{{ data.userInfoBo?.introduce }}</div>
+                <div class="introduce">{{ userInfo?.bandDesc }}</div>
               </div>
             </div>
           </div>
@@ -204,10 +219,11 @@
               <div class="text" style="margin-left: 9px">学习进度</div>
               <div class="box"></div>
             </div>
+            <!--
             <div class="rate">
-              <div class="ratetext">上次学到：启航班-领导寄语</div>
+              <div class="ratetext">上次学到：{{ data.lastLearned }}</div>
               <div class="ratebtn">继续学习</div>
-            </div>
+            </div>-->
             <div style="margin-top: 16px">
               <div class="progressBox">
                 <div>总进度</div>
@@ -218,35 +234,31 @@
                         :show-text="false"
                         :stroke-width="8"
                         :color="
-                         {
+                        {
-                          0:'rgba(238, 112, 108, 1)',
+                          0: 'rgba(238, 112, 108, 1)',
-                          1:'rgba(255, 151, 38, 1)',
+                          1: 'rgba(255, 151, 38, 1)',
-                          2:'rgba(39, 122, 255, 1)',
+                          2: 'rgba(39, 122, 255, 1)',
-                          3:'rgba(59, 94, 251, 1)',
+                          3: 'rgba(59, 94, 251, 1)',
-                          4:'rgba(57, 219, 183, 1)',
+                          4: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                          5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(data.currentChapterCnt/data.totalChapterCnt)]
+                        }[(parseInt(data.currentChapterCnt/data.totalChapterCnt)* 100) / 20]
                       "
                     />
                   </div>
                   <div
-                      style="
+                      style="font-size: 14px; font-weight: 500; margin-left: 10px"
-                      font-size: 14px;
-                      font-weight: 500;
-                      margin-left: 10px;
-                    "
                       :style="{
                       color: {
-                          0:'rgba(238, 112, 108, 1)',
+                        0: 'rgba(238, 112, 108, 1)',
-                          1:'rgba(255, 151, 38, 1)',
+                        1: 'rgba(255, 151, 38, 1)',
-                          2:'rgba(39, 122, 255, 1)',
+                        2: 'rgba(39, 122, 255, 1)',
-                          3:'rgba(59, 94, 251, 1)',
+                        3: 'rgba(59, 94, 251, 1)',
-                          4:'rgba(57, 219, 183, 1)',
+                        4: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                        5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(data.currentChapterCnt/data.totalChapterCnt)]
+                      }[parseInt((data.currentChapterCnt/data.totalChapterCnt * 100) / 20)],
                     }"
                   >
-                    {{ parseInt(data.currentChapterCnt / data.totalChapterCnt * 100) }}%
+                    {{ parseInt(data.currentChapterCnt/data.totalChapterCnt * 100) }}%
                   </div>
                 </div>
               </div>
@@ -262,13 +274,13 @@
                         :stroke-width="8"
                         :color="
                         {
-                          0:'rgba(238, 112, 108, 1)',
+                          0: 'rgba(238, 112, 108, 1)',
-                          1:'rgba(255, 151, 38, 1)',
+                          1: 'rgba(255, 151, 38, 1)',
-                          2:'rgba(39, 122, 255, 1)',
+                          2: 'rgba(39, 122, 255, 1)',
-                          3:'rgba(59, 94, 251, 1)',
+                          3: 'rgba(59, 94, 251, 1)',
-                          4:'rgba(57, 219, 183, 1)',
+                          4: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                          5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(data.currentReqCnt/data.totalReqCnt)]
+                        }[parseInt((data.currentReqCnt/data.totalReqCnt * 100) / 20)]
                       "
                     />
                   </div>
@@ -280,18 +292,17 @@
                       margin-left: 10px;
                     "
                       :style="{
-                      color:
+                      color: {
-                        {
+                        0: 'rgba(238, 112, 108, 1)',
-                          0:'rgba(238, 112, 108, 1)',
+                        1: 'rgba(255, 151, 38, 1)',
-                          1:'rgba(255, 151, 38, 1)',
+                        2: 'rgba(39, 122, 255, 1)',
-                          2:'rgba(39, 122, 255, 1)',
+                        3: 'rgba(59, 94, 251, 1)',
-                          3:'rgba(59, 94, 251, 1)',
+                        4: 'rgba(57, 219, 183, 1)',
-                          4:'rgba(57, 219, 183, 1)',
+                        5: 'rgba(57, 219, 183, 1)',
-                          5:'rgba(57, 219, 183, 1)'
+                      }[parseInt((data.currentReqCnt/data.totalReqCnt * 100) / 20)],
-                        }[parseInt(data.currentReqCnt/data.totalReqCnt)]
                     }"
                   >
-                    {{ parseInt(data.currentReqCnt / data.totalReqCnt * 100) }}%
+                    {{ parseInt(data.currentReqCnt/data.totalReqCnt * 100) }}%
                   </div>
                 </div>
               </div>
@@ -302,279 +313,154 @@
       </div>
     </div>
     <!-- 详细信息 -->
+    <!-- 弹框提示信息 -->
+		<el-dialog
+			title=""
+			top="347px"
+			v-model="dialogVisible"
+			:show-close="false"
+			style="display:flex;justify-content:center;align-items:center;height: 283px;padding:0;border-radius: 4px;"
+			width="502px">
+			<div style="width:288px;color:#333333;font-size: 22px;font-weight: 600;">{{ dialogVisibleTip }}</div>
+			<span slot="footer" style="display:inline-block;margin-top:60px;">
+				<el-button @click="dialogVisible = false" style="width:140px;height:40px;margin-right: 22px;">取消</el-button>
+				<el-button type="primary" @click="dialogVisible = false"  style="width:140px;height:40px;">确定</el-button>
+			</span>
+		</el-dialog>
   </div>
 </template>
 
 <script setup>
 import {computed, reactive, ref, watch} from "vue";
-import word from '@/assets/image/file/word.png'
+import circle from '../../assets/image/pathdetails/circle.png';
-import ppt from '@/assets/image/file/ppt.png'
+import circle2 from '../../assets/image/pathdetails/circle2.png';
-import pdf from '@/assets/image/file/pdf.png'
+import {boeRequest, useRequest, request} from "@/api/request";
-import zip from '@/assets/image/file/zip.png'
+import {ROUTER_PROCESS, LINK_DETAILS, STUDY_RECORD} from "@/api/api";
-import md from '@/assets/image/file/md.png'
-import medal1 from '@/assets/image/medal/medal1.png'
-import medal2 from '@/assets/image/medal/medal2.png'
-import medal3 from '@/assets/image/medal/medal3.png'
-import img from '@/assets/image/uploadimg.png'
-import {boeRequest, useRequest} from "@/api/request";
-import {BASE_URL, ROUTER_PROCESS} from "@/api/api";
 import {useRoute, useRouter} from "vue-router";
-import {ElMessage} from 'element-plus'
+import {ElMessage} from "element-plus";
-import {useUserInfo} from "@/api/utils";
+import store from "@/store";
 
-const {query: {routerId}} = useRoute()
+const {
-const router = useRouter()
+  query: {routerId, routerName},
-const {data} = useRequest(ROUTER_PROCESS, {routerId})
+} = useRoute();
-const {avatar: userAvatar} = useUserInfo(computed(() => data.value?.userInfoBo?.userId))
+const router = useRouter();
+const returnclick = () => {
+  router.back();
+};
+const {data} = useRequest(ROUTER_PROCESS, {routerId});
+const userInfo = computed(() => store.state.userInfo);
 
-const state = reactive({
+const activeName = ref("first");
-  course: [
-    {
-      state: 1, //1：进行中 2：未开始
-      title: "序：产品经理从初级到中级",
-      courseItem: [
-        {
-          id: 1,
-          name: "人工智能启蒙就讲解（上）",
-          tag: [
-            {
-              classify: 1, //1：必修  2：选修  3：在线、测评等  4：标签
-              name: "必修",
-            },
-            {
-              classify: 3,
-              name: "在线",
-            },
-            {
-              classify: 4,
-              name: "#通用力",
-            },
-            {
-              classify: 4,
-              name: "#前沿趋势",
-            },
-          ],
-          progress: 90,
-        },
-        {
-          id: 1,
-          name: "人工智能启蒙就讲解（下）",
-          tag: [
-            {
-              classify: 2,
-              name: "选修",
-            },
-            {
-              classify: 3,
-              name: "测评",
-            },
-            {
-              classify: 4,
-              name: "#通用力",
-            },
-            {
-              classify: 4,
-              name: "#前沿趋势",
-            },
-          ],
-          progress: 0,
-        },
-      ],
-    },
-    {
-      state: 2, //1：进行中 2：未开始
-      title: "第一讲：中级产品经理的思考逻辑",
-      courseItem: [
-        {
-          id: 1,
-          name: "趣味课前小测 - MBTI测试：你适合做哪个方向？",
-          tag: [
-            {
-              classify: 1, //1：必修  2：选修  3：在线、测评等  4：标签
-              name: "必修",
-            },
-            {
-              classify: 3,
-              name: "测评",
-            },
-          ],
-          progress: 48,
-        },
-        {
-          id: 1,
-          name: "趣味课前小测 - MBTI测试：你适合做哪个方向？",
-          tag: [
-            {
-              classify: 2,
-              name: "选修",
-            },
-            {
-              classify: 3,
-              name: "外部链接",
-            },
-          ],
-          progress: 0,
-        },
-      ],
-    },
-    {
-      state: 2, //1：进行中 2：未开始
-      title: "第二讲：模块化产品展示",
-      courseItem: [
-        {
-          id: 1,
-          name: "模块化产品展示相关案例与展示：如何自由组合你的思考？",
-          tag: [
-            {
-              classify: 1, //1：必修  2：选修  3：在线、测评等  4：标签
-              name: "必修",
-            },
-            {
-              classify: 3,
-              name: "测评",
-            },
-          ],
-          progress: 48,
-        },
-        {
-          id: 1,
-          name: "社交产品如何做好模块化处理？",
-          tag: [
-            {
-              classify: 2,
-              name: "选修",
-            },
-            {
-              classify: 3,
-              name: "作业",
-            },
-          ],
-          progress: 0,
-        },
-        {
-          id: 1,
-          name: "微信与Telegram哪个平台的功能模块化做的最好？",
-          tag: [
-            {
-              classify: 2,
-              name: "选修",
-            },
-            {
-              classify: 3,
-              name: "辩论",
-            },
-          ],
-          progress: 0,
-        },
-      ],
-    },
-  ],
-  sharedoc: [
-    {
-      id: 1,
-      name: "项目参考文档.doc",
-      img: word,
-    },
-    {
-      id: 2,
-      name: "人工智能启蒙讲解讲义.pptx",
-      img: ppt,
-    },
-    {
-      id: 3,
-      name: "中级产品经理必备工具.pdf",
-      img: pdf,
-    },
-    {
-      id: 4,
-      name: "Python学习入门讲义.zip",
-      img: zip,
-    },
-    {
-      id: 5,
-      name: "Axure RP10更新内容.md",
-      img: md,
-    },
-  ],
-  teacher: [
-    {
-      id: 1,
-      name: "王星天（显示事业）",
-      introduce: "教师是学生的镜子,学生是老师的影子。",
-      peopleimg: img,
-      medal: [
-        medal1,
-        medal2,
-        medal3,
-      ],
-    },
-  ],
-});
-const activeName = ref('first')
-const totalprogress = ref(30)
-const compulsoryprogress = ref(10)
 
 const handleClick = (tab, event) => {
   console.log(tab, event);
 };
-const path = {1: 'path'}
+const path = {1: "path"};
+
+const dialogVisible = ref(false);
+const dialogVisibleTip = ref('');
+
+function introductionPro() {
+	dialogVisibleTip.value =data.value.remark;
+	dialogVisible.value = true;
+}
 
 const types = ref({
   typeName: {
-    1: '在线',
+    1: "在线",
-    2: '面授',
+    2: "面授",
-    3: '案例',
+    3: "案例",
-    4: '作业',
+    4: "作业",
-    5: '考试',
+    5: "考试",
-    6: '直播',
+    6: "直播",
-    7: '外链',
+    7: "外链",
-    8: '讨论',
+    8: "讨论",
-    9: '活动',
+    9: "活动",
-    10: '测评',
+    10: "测评",
-    11: '评估',
+    11: "评估",
-    12: '投票',
+    12: "投票",
-    13: '项目',
+    13: "项目",
   },
   toName: {
-    1: '去上课',
+    1: "去上课",
-    2: '去上课',
+    2: "去上课",
-    3: '案例',
+    3: "去阅读",
-    4: '去完成',
+    4: "去完成",
-    5: '去完成',
+    5: "去完成",
-    6: '去签到',
+    6: "去观看",
-    7: '外链',
+    7: "去查看",
-    8: '去讨论',
+    8: "去讨论",
-    9: '去签到',
+    9: "去签到",
-    10: '去完成',
+    10: "去完成",
-    11: '去完成',
+    11: "去完成",
-    12: '去投票',
+    12: "去投票",
-    13: '去完成',
+    13: "去完成",
   },
   path: {
-    1: '',
+    1: import.meta.env.VITE_BOE_ONLINE_CLASS_URL, //在线
-    2: '/faceteach',
+    2: "/faceteach",
-    3: '',
+    3: import.meta.env.VITE_BOE_CASS_DETAIL_URL, //案例
-    4: '/homeworkpage',
+    4: "/homeworkpage",
-    5: '',
+    5: import.meta.env.VITE_BOE_EXAM_DETAIL_URL, //考试
-    6: '/livebroadcast',
+    6: "/livebroadcast",
-    7: '',
+    7: ({courseId}) =>
-    8: '/discusspage',
+        request(LINK_DETAILS(courseId), {}).then(({data: {linkAddress}}) =>
-    9: '/moreactive',
+            window.open(linkAddress)
-    10: '/surveydetail',
+        ), //外联
-    11: '/surveydetail',
+    8: "/discusspage",
-    12: '/ballotpage',
+    9: "/moreactive",
-    13: '去完成'
+    10: ({evaType, targetId}) =>
-  }
+        window.open(
-})
+            (evaType == 0
+                ? import.meta.env.VITE_BOE_TEST_DETAIL_URL
+                : import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId
+        ), //测评
+    11: "/surveydetail",
+    12: "/ballotpage",
+    13: "/projectdetails",
+  },
+});
 
 function toFinish(d) {
   if (!types.value.path[d.type]) {
-    ElMessage.error('暂时未开放')
+    ElMessage.error("暂时未开放");
-    return
+    return;
+  }
+  if (d.type === 3 || d.type === 7) {
+    request(STUDY_RECORD, {
+      studentId: userInfo.value.id,
+      targetId: data.value.routerId,
+      logo: 1,
+      stageOrChapterId: data.value.currentStageId,
+      taskId: d.routerTaskId,
+    });
+  }
+  if (typeof types.value.path[d.type] === "string") {
+    types.value.path[d.type] &&
+    types.value.path[d.type].startsWith("http") &&
+    window.open(types.value.path[d.type] + d.targetId);
+    types.value.path[d.type] &&
+    types.value.path[d.type].startsWith("/") &&
+    router.push({
+      path: types.value.path[d.type],
+      query: {
+        id: d.routerTaskId,
+        type: 1,
+        courseId: d.courseId,
+        pName: data.value.name,
+        sName:data.currentStageName,
+      },
+    });
+  } else if (typeof types.value.path[d.type] === "function") {
+    console.log("ddddddd", d);
+    types.value.path[d.type](d);
+    // console.log("types.value.path[d.type](d)", d);
   }
-  router.push({path: types.value.path[d.type], query: {id: d.routerTaskId, type: 1, courseId: d.courseId}})
 }
 
+function whiteTypes(type) {
+  return import.meta.env.VITE_TASK_WHITE_TYPE.includes("-" + type + "-");
+}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
@@ -651,6 +537,9 @@ function toFinish(d) {
           font-weight: 500;
           color: #333330;
           line-height: 24px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
 
         .coursetag {

src/views/survey/SurveyDetail.vue

@@ -5,39 +5,209 @@
       style="display: flex; align-items: center; justify-content: space-between"
     >
       <div class="crumb">
-        <div>混合制项目</div>
+        <div>{{ pName }}</div>
         <div style="margin-left: 6px; margin-right: 6px">/</div>
-        <div>管理者进阶-腾飞班</div>
+        <div>{{ sName }}</div>
         <div style="margin-left: 6px; margin-right: 6px">/</div>
-        <div style="font-weight: 700; font-size: 16px">调研详情</div>
+        <div style="font-weight: 700; font-size: 16px">评估详情</div>
       </div>
+      <!-- 
       <div class="prevnext">
         <div class="prev">
           <img
-            style="width: 23px; height: 23px"
+              style="width: 23px; height: 23px"
-            src="../../assets/image/prev.png"
+              src="../../assets/image/prev.png"
           />
           <div style="margin-left: 7px">上一个</div>
         </div>
         <div class="prev" style="margin-left: 31px">
           <div style="margin-right: 7px">下一个</div>
           <img
-            style="width: 23px; height: 23px"
+              style="width: 23px; height: 23px"
-            src="../../assets/image/next.png"
+              src="../../assets/image/next.png"
           />
+        </div>-->
+      <div class="return">
+        <div style="display: flex" @click="returnclick">
+          <img
+            class="img2"
+            style="margin-right: 22px"
+            src="../../assets/image/return.png"
+          />
+          <div class="text" style="color: #fff">返回</div>
         </div>
       </div>
     </div>
     <!-- 面包屑导航 -->
     <!-- 标题 -->
-    <div class="title">【调研】管理者进阶腾飞班 - 培训阶段性调研</div>
+    <div class="title">【评估】{{data.assessmentName}}</div>
     <!-- 标题 -->
     <!-- 基本信息 -->
     <div class="bascinfo">
       <div>
+        <!-- {{ [data.assessmentEssayQuestionDtoList,data.assessmentMultipleChoiceDtoList,data.assessmentScoringQuestionDtoList,data.assessmentSingleChoiceDtoList].sort((a,b)=>{
+          return a[0].orderNumber - b[0].orderNumber
+        }) }} -->
+
         <div
           class="question"
-          v-for="(value, index) in data.scoringQuestionVoList"
+          v-for="(value, index) in [data.assessmentEssayQuestionDtoList,data.assessmentMultipleChoiceDtoList,data.assessmentScoringQuestionDtoList,data.assessmentSingleChoiceDtoList].sort((a,b)=>{
+          return a[0].orderNumber - b[0].orderNumber
+        }) "
+          :key="index"
+          :style="{ 'margin-top': index === 0 ? '57px' : '41px' }"
+        >
+          <div v-if="value[0].questionType=='4'">
+            <div
+              class="question"
+              v-for="(value, index) in data.assessmentScoringQuestionDtoList"
+              :key="index"
+              :style="{ 'margin-top': index === 0 ? '57px' : '41px' }"
+            >
+              <div class="text">{{ value.assessmentScTitle }}</div>
+              <div class="answer">
+                <div class="answerL">完全没用</div>
+                <div class="answerC">
+                  <div
+                    class="answerCitem"
+                    v-for="(item, key) in Array.from(
+                      { length: value.assessmentMaxScore },
+                      (k, i) => i
+                    )"
+                    :key="key"
+                    :style="{
+                      'margin-left': key === 0 ? '15px' : '10px',
+                      background:
+                        value.selectAnswer === item
+                          ? 'rgba(86, 163, 249, 1)'
+                          : 'rgba(86, 163, 249, 0)',
+                      color:
+                        value.selectAnswer === item
+                          ? '#fff'
+                          : 'rgba(86, 163, 249, 1)',
+                    }"
+                    @click="
+                      () => {
+                        if (data.isSubmit) {
+                          return;
+                        }
+                        value.selectAnswer = item;
+                      }
+                    "
+                  >
+                    <div>{{ item + 1 }}</div>
+                  </div>
+                </div>
+                <div class="answerR">非常有帮助/启发</div>
+              </div>
+            </div>
+          </div>
+
+          <div v-else-if="value[0].questionType=='1'">
+            <div
+              class="question"
+              style="margin-top: 41px"
+              v-if="
+                data.assessmentSingleChoiceDtoList &&
+                data.assessmentSingleChoiceDtoList.length
+              "
+            >
+              <div class="text">
+                {{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}
+              </div>
+              <div
+                v-for="(value, index) in data.assessmentSingleChoiceDtoList"
+                :key="index"
+                style="display: flex; align-items: center"
+                :style="{
+                  'margin-top': index === 0 ? '29px' : '22px',
+                  cursor: 'pointer',
+                }"
+                @click="
+                  () => {
+                    if (data.isSubmit) {
+                      return;
+                    }
+                    data.assessmentSingleChoiceDtoList.forEach((e) => {
+                      e.select = false;
+                    });
+                    value.select = true;
+                  }
+                "
+              >
+                <img
+                  style="width: 19px; height: 18px; cursor: pointer"
+                  :src="value.select ? checkbox : checkbox2"
+                />
+                <div class="people">{{ value.singleOptionName }}</div>
+              </div>
+            </div>
+          </div>
+
+          <div v-else-if="value[0].questionType=='2'">
+            <div
+              class="question"
+              style="margin-top: 41px"
+              v-if="
+                data.assessmentMultipleChoiceDtoList &&
+                data.assessmentMultipleChoiceDtoList.length
+              "
+            >
+              <div class="text">
+                {{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}
+              </div>
+              <div
+                v-for="(value, index) in data.assessmentMultipleChoiceDtoList"
+                :key="index"
+                style="display: flex; align-items: center"
+                :style="{
+                  'margin-top': index === 0 ? '29px' : '22px',
+                  cursor: 'pointer',
+                }"
+                @click="
+                  () => {
+                    if (data.isSubmit) {
+                      return;
+                    }
+                    value.select = !value.select;
+                  }
+                "
+              >
+                <img
+                  style="width: 19px; height: 18px; cursor: pointer"
+                  :src="value.select ? checkbox : checkbox2"
+                />
+                <div class="people">{{ value.multipleOptionName }}</div>
+              </div>
+            </div>
+          </div>
+
+          <div v-else-if="value[0].questionType=='3'">
+            <div
+              class="question"
+              style="margin-top: 41px"
+              v-for="(item, i) in data.assessmentEssayQuestionDtoList"
+              :key="i"
+            >
+              <div class="text">{{ item.assessmentQaTitle }}</div>
+              <div style="width: 713px; margin-top: 31px; position: relative">
+                <el-input
+                  v-model="item.content"
+                  :autosize="{ minRows: 5, maxRows: 5 }"
+                  resize="none"
+                  maxlength="200"
+                  type="textarea"
+                  :readonly="!!data.isSubmit"
+                />
+                <div class="words">{{ item.content?.length || 0 }}/200</div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- <div
+          class="question"
+          v-for="(value, index) in data.assessmentScoringQuestionDtoList"
           :key="index"
           :style="{ 'margin-top': index === 0 ? '57px' : '41px' }"
         >
@@ -65,6 +235,9 @@
                 }"
                 @click="
                   () => {
+                    if (data.isSubmit) {
+                      return;
+                    }
                     value.selectAnswer = item;
                   }
                 "
@@ -75,15 +248,20 @@
             <div class="answerR">非常有帮助/启发</div>
           </div>
         </div>
+        
         <div
           class="question"
           style="margin-top: 41px"
-          v-for="(item, i) in data.singleStemVoList"
+          v-if="
-          :key="i"
+            data.assessmentSingleChoiceDtoList &&
+            data.assessmentSingleChoiceDtoList.length
+          "
         >
-          <div class="text">{{ item.singleStemName }}</div>
+          <div class="text">
+            {{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}
+          </div>
           <div
-            v-for="(value, index) in item.assessmentSingleChoiceVoList"
+            v-for="(value, index) in data.assessmentSingleChoiceDtoList"
             :key="index"
             style="display: flex; align-items: center"
             :style="{
@@ -92,7 +270,10 @@
             }"
             @click="
               () => {
-                item.assessmentSingleChoiceVoList.forEach((e) => {
+                if (data.isSubmit) {
+                  return;
+                }
+                data.assessmentSingleChoiceDtoList.forEach((e) => {
                   e.select = false;
                 });
                 value.select = true;
@@ -110,19 +291,30 @@
         <div
           class="question"
           style="margin-top: 41px"
-          v-for="(item, i) in data.multipleStemVoList"
+          v-if="
-          :key="i"
+            data.assessmentMultipleChoiceDtoList &&
+            data.assessmentMultipleChoiceDtoList.length
+          "
         >
-          <div class="text">{{ item.multipleStemName }}</div>
+          <div class="text">
+            {{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}
+          </div>
           <div
-            v-for="(value, index) in item.multipleChoiceVoList"
+            v-for="(value, index) in data.assessmentMultipleChoiceDtoList"
             :key="index"
             style="display: flex; align-items: center"
             :style="{
               'margin-top': index === 0 ? '29px' : '22px',
               cursor: 'pointer',
             }"
-            @click="() => (value.select = !value.select)"
+            @click="
+              () => {
+                if (data.isSubmit) {
+                  return;
+                }
+                value.select = !value.select;
+              }
+            "
           >
             <img
               style="width: 19px; height: 18px; cursor: pointer"
@@ -131,10 +323,11 @@
             <div class="people">{{ value.multipleOptionName }}</div>
           </div>
         </div>
+        
         <div
           class="question"
           style="margin-top: 41px"
-          v-for="(item, i) in data.essayQuestionVoList"
+          v-for="(item, i) in data.assessmentEssayQuestionDtoList"
           :key="i"
         >
           <div class="text">{{ item.assessmentQaTitle }}</div>
@@ -145,41 +338,127 @@
               resize="none"
               maxlength="200"
               type="textarea"
+              :readonly="!!data.isSubmit"
             />
             <div class="words">{{ item.content?.length || 0 }}/200</div>
           </div>
-        </div>
+        </div> -->
-        <div style="display: flex; justify-content: center">
+        
-          <div class="submit" @click="submit">提交</div>
+        <div
+          style="display: flex; justify-content: center"
+          v-if="
+            data.assessmentEssayQuestionDtoList?.length ||
+            data.assessmentMultipleChoiceDtoList?.length ||
+            data.assessmentSingleChoiceDtoList?.length ||
+            data.assessmentScoringQuestionDtoList?.length
+          "
+        >
+          <div
+            class="submit"
+            @click="submit"
+            :style="{ background: data.isSubmit ? '#999' : '#2478ff' }"
+          >
+            提交
+          </div>
         </div>
       </div>
     </div>
     <!-- 基本信息 -->
     <!--    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";
 import checkbox2 from "@/assets/image/checkbox2.png";
-import { useRoute } from "vue-router/dist/vue-router";
+import { useRoute, useRouter } from "vue-router/dist/vue-router";
 import { request, usePage, useRequest } from "@/api/request";
-import {
+import { ASSESSMENT_QUERY, ASSESSMENT_SUBMIT } from "@/api/api";
-  ASSESSMENT_QUERY,
+import { ElMessage } from "element-plus";
-  ASSESSMENT_SUBMIT,
+import {  ref} from "vue";
-  COMMENT_LIST,
-  DISCUSS_DETAIL,
-} from "@/api/api";
 
 const {
-  query: { courseId },
+  query: { courseId, id: taskId, type, pName, sName },
 } = useRoute();
+const router = useRouter();
+const returnclick = () => {
+  router.back();
+};
 
-const { data } = useRequest(ASSESSMENT_QUERY(courseId), {});
+const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId });
+console.log('我是需要排序得题目', data )
 
+const centerDialogVisible =ref(false);
+const open=()=>{
+  centerDialogVisible.value = true
+};
 function submit() {
-  request(ASSESSMENT_SUBMIT, data).then(() => {
+  if (data.value.isSubmit) {
-    console.log("提交成功");
+    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();
   });
+
 }
 </script>
 <style lang="scss">
@@ -190,7 +469,16 @@ function submit() {
     font-size: 14px;
     line-height: 24px;
   }
-
+  .return {
+    position: absolute;
+    right: 10%;
+    .text {
+      text-align: center;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+    }
+  }
   .prevnext {
     display: flex;
     align-items: center;

vite.config.js

@@ -2,16 +2,13 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 17:28:10
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-13 20:49:00
+ * @LastEditTime: 2022-12-15 11:51:59
  * @FilePath: /fe-stu/vite.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-import { defineConfig } from 'vite'
+import { defineConfig, loadEnv } from 'vite'
 import vue from '@vitejs/plugin-vue'
-import legacy from '@vitejs/plugin-legacy'
-import { viteMockServe } from 'vite-plugin-mock'
 import topLevelAwait from "vite-plugin-top-level-await";
-
 const path = require('path')
 // const url = 'http://localhost:30001'
 const url = 'https://u.boe.com/manageApi-release'
@@ -93,6 +90,5 @@ export default defineConfig(({ command }) =>
                 changeOrigin: true,
             },
         }
-    }
+    })
-})
 )