diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 6f40582..497f1cd 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -2,6 +2,22 @@ require('@rushstack/eslint-patch/modern-module-resolution') module.exports = { +rules: { + // 忽略未使用的变量和参数 + '@typescript-eslint/no-unused-vars': 'off', + 'no-unused-vars': 'off', + + // 或者设置为警告级别 + // '@typescript-eslint/no-unused-vars': 'warn', + // 'no-unused-vars': 'warn', + + // Vue 相关规则 + 'vue/multi-word-component-names': 'off', + 'vue/no-unused-vars': 'off', + 'vue/no-mutating-props': 'off', + 'no-empty-pattern': 'off' + + }, root: true, 'extends': [ 'plugin:vue/vue3-essential', diff --git a/src/assets/icons/modelSelected.svg b/src/assets/icons/modelSelected.svg new file mode 100644 index 0000000..7056127 --- /dev/null +++ b/src/assets/icons/modelSelected.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/components/selectStyle/selectItem.vue b/src/components/selectStyle/selectItem.vue index b3ed99e..1935e3e 100644 --- a/src/components/selectStyle/selectItem.vue +++ b/src/components/selectStyle/selectItem.vue @@ -1,11 +1,50 @@ \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index f4c5bc0..d38ca24 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -23,6 +23,16 @@ const router = createRouter({ name: 'SelectStyle', component: () => import('../views/Workshop/selectStyle.vue'), }, + { + path: '/workshop/selectModel', + name: 'SelectModel', + component: () => import('../views/Workshop/selectModel.vue'), + }, + { + path: '/workshop/selectModelContinue', + name: 'SelectModelContinue', + component: () => import('../views/Workshop/selectModelContinue.vue'), + }, ] diff --git a/src/utils/flexible.js b/src/utils/flexible.js index 4594585..09aa4bb 100644 --- a/src/utils/flexible.js +++ b/src/utils/flexible.js @@ -1,6 +1,6 @@ import { getUniversalZoomLevel } from '@/utils/tools' -let flexible = (designWidth, maxWidth,minWidth) =>{ +let flexible = (designWidth) =>{ var doc = document, win = window, docEl = doc.documentElement, remStyle = document.createElement("style"), tid; designWidth = designWidth || 1080; // maxWidth = maxWidth || 1920; diff --git a/src/views/Workshop/selectModel.vue b/src/views/Workshop/selectModel.vue new file mode 100644 index 0000000..6c0db5c --- /dev/null +++ b/src/views/Workshop/selectModel.vue @@ -0,0 +1,129 @@ + + + \ No newline at end of file diff --git a/src/views/Workshop/selectModelContinue.vue b/src/views/Workshop/selectModelContinue.vue new file mode 100644 index 0000000..344cecb --- /dev/null +++ b/src/views/Workshop/selectModelContinue.vue @@ -0,0 +1,118 @@ + + + \ No newline at end of file diff --git a/src/views/Workshop/selectStyle.vue b/src/views/Workshop/selectStyle.vue index f76c0de..6e48c9c 100644 --- a/src/views/Workshop/selectStyle.vue +++ b/src/views/Workshop/selectStyle.vue @@ -1,34 +1,79 @@ \ No newline at end of file