diff --git a/package-lock.json b/package-lock.json index a258ec6..7df5552 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1018,6 +1018,11 @@ "@types/node": "*" } }, + "@types/json-schema": { + "version": "7.0.7", + "resolved": "https://registry.nlark.com/@types/json-schema/download/@types/json-schema-7.0.7.tgz", + "integrity": "sha1-mKmTUWyFnrDVxMjwmDF6nqaNua0=" + }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -1568,8 +1573,7 @@ "ajv-keywords": { "version": "3.4.1", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz", - "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==", - "dev": true + "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==" }, "alphanum-sort": { "version": "1.0.2", @@ -1997,6 +2001,11 @@ "resolve": "^1.4.0" } }, + "babel-plugin-syntax-dynamic-import": { + "version": "6.18.0", + "resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-dynamic-import/download/babel-plugin-syntax-dynamic-import-6.18.0.tgz", + "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=" + }, "babel-polyfill": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz", @@ -9133,6 +9142,11 @@ "sha.js": "^2.4.8" } }, + "pdfjs-dist": { + "version": "2.6.347", + "resolved": "https://registry.nlark.com/pdfjs-dist/download/pdfjs-dist-2.6.347.tgz", + "integrity": "sha1-8lftZug76QDND9KFJKIYf7niXNU=" + }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -10212,6 +10226,76 @@ "unpipe": "1.0.0" } }, + "raw-loader": { + "version": "4.0.2", + "resolved": "https://registry.npm.taobao.org/raw-loader/download/raw-loader-4.0.2.tgz", + "integrity": "sha1-GqxrfRrRUB5m79rBUixz5ZpYTrY=", + "requires": { + "loader-utils": "^2.0.0", + "schema-utils": "^3.0.0" + }, + "dependencies": { + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.nlark.com/ajv/download/ajv-6.12.6.tgz", + "integrity": "sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ=", + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1616882441894&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz", + "integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0=" + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz", + "integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang=" + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz", + "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=" + }, + "json5": { + "version": "2.2.0", + "resolved": "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz", + "integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=", + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz", + "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=", + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1589682820731&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz", + "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=" + }, + "schema-utils": { + "version": "3.0.0", + "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-3.0.0.tgz", + "integrity": "sha1-Z1AvaqK2ai1AMrQnmilEl4oJE+8=", + "requires": { + "@types/json-schema": "^7.0.6", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + } + } + } + }, "read-pkg": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", @@ -12530,11 +12614,6 @@ "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==", "dev": true }, - "vue-i18n": { - "version": "8.15.1", - "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.15.1.tgz", - "integrity": "sha512-GBbz8qYCu0U2LNu4IcuFLZiuyninG4k26knvhL7GZG5Ncp4RR2VKDEH6g8gQ6I+UUBCvH2MBQVPSdxWe4DBkPw==" - }, "vue-loader": { "version": "15.7.2", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.7.2.tgz", @@ -12548,6 +12627,44 @@ "vue-style-loader": "^4.1.0" } }, + "vue-pdf": { + "version": "4.3.0", + "resolved": "https://registry.nlark.com/vue-pdf/download/vue-pdf-4.3.0.tgz", + "integrity": "sha1-1feQ7nln57eqkIm5exGrFo4Z29A=", + "requires": { + "babel-plugin-syntax-dynamic-import": "^6.18.0", + "loader-utils": "^1.4.0", + "pdfjs-dist": "2.6.347", + "raw-loader": "^4.0.2", + "vue-resize-sensor": "^2.0.0", + "worker-loader": "^2.0.0" + }, + "dependencies": { + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz", + "integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang=" + }, + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npm.taobao.org/json5/download/json5-1.0.1.tgz", + "integrity": "sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4=", + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.0", + "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-1.4.0.tgz", + "integrity": "sha1-xXm140yzSxp07cbB+za/o3HVphM=", + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + } + } + } + }, "vue-quill-editor": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz", @@ -12557,6 +12674,11 @@ "quill": "^1.3.4" } }, + "vue-resize-sensor": { + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/vue-resize-sensor/download/vue-resize-sensor-2.0.0.tgz", + "integrity": "sha1-Olh/1oAuFohwnPLFqtrnoAdZUr8=" + }, "vue-router": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.3.tgz", @@ -13036,6 +13158,26 @@ "errno": "~0.1.7" } }, + "worker-loader": { + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/worker-loader/download/worker-loader-2.0.0.tgz", + "integrity": "sha1-Rf2j73asqBV3GokQc5nuQRm0MKw=", + "requires": { + "loader-utils": "^1.0.0", + "schema-utils": "^0.4.0" + }, + "dependencies": { + "schema-utils": { + "version": "0.4.7", + "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz", + "integrity": "sha1-unT1l9K+LqiAExdG7hfQoJPGgYc=", + "requires": { + "ajv": "^6.1.0", + "ajv-keywords": "^3.1.0" + } + } + } + }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", diff --git a/package.json b/package.json index 4a52f9f..e8258c7 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,8 @@ "vue-router": "^3.0.3", "vue-schart": "^2.0.0", "vuedraggable": "^2.17.0", - "vuex": "^3.1.2" + "vuex": "^3.1.2", + "vue-pdf": "^4.2.0" }, "devDependencies": { "@vue/cli-plugin-babel": "^3.9.0", diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 653e6db..d8d6caa 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -285,6 +285,28 @@ li { padding: 20px 0; border-bottom: 1px dashed #eee; } +.border-b-dashed{ + border-bottom: 1px dashed #e3e3e3; + width: 100%; + height: 1px; + margin-bottom: 20px; +} +.shadow{ + border: 0.0625rem solid #EBEEF5; + background-color: #FFF; + color: #303133; + -webkit-transition: .3s; + transition: .3s; +} +.shadow :hover{ + box-shadow: 0 0.125rem 0.75rem 0 rgb(0 0 0 / 10%); + +} +.flex-col{ + display: flex; + flex-direction: column; + +} .addhr_tag{ background-color: #666; width: 6px; diff --git a/src/components/Header.vue b/src/components/Header.vue index 0cb62d9..c97fc85 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -39,10 +39,10 @@ export default { localStorage.removeItem('ms_username'); this.$router.push('/login'); sessionStorage.clear() - + }, goHome(){ - this.$router.push('/dashboard') + this.$router.push('/customer') } }, }; diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index 166176b..c6aa132 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -57,7 +57,7 @@ export default { items: [ { icon: 'el-icon-lx-home', - index: 'dashboard', + index: 'customer', title: '客户管理' }, { @@ -86,7 +86,7 @@ export default { title: '数据管理' } ], - onRoutes:'dashboard' + onRoutes:'customer' }; }, watch:{ diff --git a/src/components/pdf.vue b/src/components/pdf.vue new file mode 100644 index 0000000..fa78b74 --- /dev/null +++ b/src/components/pdf.vue @@ -0,0 +1,104 @@ + + + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 2f2529f..1b750d4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -17,8 +17,8 @@ let router = new Router({ meta: { title: '自述文件' }, children: [ { - path: '/dashboard', - component: () => import(/* webpackChunkName: "dashboard" */ '../views/customer/Dashboard.vue'), + path: '/customer', + component: () => import(/* webpackChunkName: "dashboard" */ '../views/customer/customer.vue'), meta: { title: '客户管理' } }, { diff --git a/src/views/Login.vue b/src/views/Login.vue index 4977a5e..89b28e7 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -67,7 +67,7 @@ export default { localStorage.setItem('ms_username', this.param.username); this.$store.commit("userLoginData", { userLogin_id : res.message.retvalue.userId}); this.$store.commit("tokenData", {loginToken: res.message.retvalue.loginToken}) - this.$router.push('/dashboard'); + this.$router.push('/customer'); }else{ this.$message.error('该用户没有权限'); } diff --git a/src/views/course/AddCurriculum.vue b/src/views/course/AddCurriculum.vue index 06405d4..580bca7 100644 --- a/src/views/course/AddCurriculum.vue +++ b/src/views/course/AddCurriculum.vue @@ -13,11 +13,12 @@ - -
+ +

课程信息
+
@@ -61,7 +62,7 @@ - + @@ -82,20 +83,61 @@
-
+

- 实训配置 + 练习配置
- 添加配置 +
+
+
+ + + + + + + + + + + + + + + + + +
+ + + +
+
+

+ 考核配置 +
+ +
+
- + - + - +