diff --git a/.editorconfig b/.editorconfig index 6f77dff..7053c49 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,39 +1,5 @@ -[*] -charset=utf-8 -end_of_line=lf -insert_final_newline=false -indent_style=space -indent_size=2 - -[{*.ng,*.sht,*.html,*.shtm,*.shtml,*.htm}] -indent_style=space -indent_size=2 - -[{*.jhm,*.xslt,*.xul,*.rng,*.xsl,*.xsd,*.ant,*.tld,*.fxml,*.jrxml,*.xml,*.jnlp,*.wsdl}] -indent_style=space -indent_size=2 - -[{.babelrc,.stylelintrc,jest.config,.eslintrc,.prettierrc,*.json,*.jsb3,*.jsb2,*.bowerrc}] -indent_style=space -indent_size=2 - -[*.svg] -indent_style=space -indent_size=2 - -[*.js.map] -indent_style=space -indent_size=2 - -[*.less] -indent_style=space -indent_size=2 - -[*.vue] -indent_style=space -indent_size=2 - -[{.analysis_options,*.yml,*.yaml}] -indent_style=space -indent_size=2 - +[*.{js,jsx,ts,tsx,vue}] +indent_style = space +indent_size = 2 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/.prettierrc b/.prettierrc index bfdd4f7..ffed764 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,24 +1,27 @@ { - "printWidth": 120, - "tabWidth": 2, - "singleQuote": true, - "trailingComma": "none", - "semi": false, - "wrap_line_length": 220, - "wrap_attributes": "false", - "proseWrap": "auto", - "arrowParens": "avoid", - "bracketSpacing": true, - "jsxBracketSameLine": true, - "useTabs": false, - "eslintIntegration":true, - "overrides": [ - { - "files": ".prettierrc", - "options": { - "parser": "json" + "printWidth": 100, + "overrides": [ + { + "files": ".prettierrc", + "options": { "parser": "json" } } - } - ], - "endOfLine": "auto" + ], + "tabWidth": 2, + "useTabs": false, + "semi": true, + "singleQuote": true, + "proseWrap": "preserve", + "arrowParens": "avoid", + "bracketSpacing": true, + "disableLanguages": ["vue"], + "endOfLine": "auto", + "eslintIntegration": false, + "htmlWhitespaceSensitivity": "ignore", + "ignorePath": ".prettierignore", + "jsxBracketSameLine": false, + "jsxSingleQuote": false, + "requireConfig": false, + "stylelintIntegration": false, + "trailingComma": "es5", + "prettier.tslintIntegration": false } diff --git a/src/components/DbLearnCount/index.vue b/src/components/DbLearnCount/index.vue new file mode 100644 index 0000000..4cc9c9b --- /dev/null +++ b/src/components/DbLearnCount/index.vue @@ -0,0 +1,49 @@ + + + + + diff --git a/src/views/mycourse/courseLearn/StatisticalLearning.vue b/src/views/mycourse/courseLearn/StatisticalLearning.vue index 94524a8..51c710c 100644 --- a/src/views/mycourse/courseLearn/StatisticalLearning.vue +++ b/src/views/mycourse/courseLearn/StatisticalLearning.vue @@ -1,10 +1,14 @@