From e23954a9de6cff0e56a92005d4ff55b8fcf55274 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 8 Aug 2024 15:42:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=EF=BC=8Cap?=
 =?UTF-8?q?i=E6=96=87=E4=BB=B6=E5=A4=B9=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 prettier.config.js                                    | 11 ++++++-----
 .../ProtocolManage.js => base/agreement.js}           |  0
 .../{BasicManage/ContactUnits.js => base/contun.js}   |  0
 src/api/{BasicManage/Project.js => base/project.js}   |  0
 src/api/{BasicManage/UnitType.js => base/unitType.js} |  0
 src/router/index.js                                   |  8 ++++----
 .../{BasicManage/mixins => base/Mixins}/common.js     |  0
 .../agreement}/components/form-protocol.vue           |  0
 .../ProtocolManage => base/agreement}/config.js       |  0
 .../ProtocolManage => base/agreement}/index.vue       |  0
 src/views/base/company/index.vue                      | 10 ++++++++++
 .../contun}/components/form-contact-units.vue         |  0
 .../ContactUnits => base/contun}/config.js            |  0
 .../ContactUnits => base/contun}/index.vue            |  0
 .../EquipmentSupplier => base/masupplier}/index.vue   |  2 +-
 .../project}/components/form-project.vue              |  0
 .../ProjectManage => base/project}/config.js          |  0
 .../ProjectManage => base/project}/index.vue          |  0
 .../unitType}/components/form-units-type.vue          |  0
 .../{BasicManage/UnitType => base/unitType}/config.js |  0
 .../{BasicManage/UnitType => base/unitType}/index.vue |  0
 21 files changed, 21 insertions(+), 10 deletions(-)
 rename src/api/{BasicManage/ProtocolManage.js => base/agreement.js} (100%)
 rename src/api/{BasicManage/ContactUnits.js => base/contun.js} (100%)
 rename src/api/{BasicManage/Project.js => base/project.js} (100%)
 rename src/api/{BasicManage/UnitType.js => base/unitType.js} (100%)
 rename src/views/{BasicManage/mixins => base/Mixins}/common.js (100%)
 rename src/views/{BasicManage/ProtocolManage => base/agreement}/components/form-protocol.vue (100%)
 rename src/views/{BasicManage/ProtocolManage => base/agreement}/config.js (100%)
 rename src/views/{BasicManage/ProtocolManage => base/agreement}/index.vue (100%)
 create mode 100644 src/views/base/company/index.vue
 rename src/views/{BasicManage/ContactUnits => base/contun}/components/form-contact-units.vue (100%)
 rename src/views/{BasicManage/ContactUnits => base/contun}/config.js (100%)
 rename src/views/{BasicManage/ContactUnits => base/contun}/index.vue (100%)
 rename src/views/{BasicManage/EquipmentSupplier => base/masupplier}/index.vue (76%)
 rename src/views/{BasicManage/ProjectManage => base/project}/components/form-project.vue (100%)
 rename src/views/{BasicManage/ProjectManage => base/project}/config.js (100%)
 rename src/views/{BasicManage/ProjectManage => base/project}/index.vue (100%)
 rename src/views/{BasicManage/UnitType => base/unitType}/components/form-units-type.vue (100%)
 rename src/views/{BasicManage/UnitType => base/unitType}/config.js (100%)
 rename src/views/{BasicManage/UnitType => base/unitType}/index.vue (100%)

diff --git a/prettier.config.js b/prettier.config.js
index c4bf424..8e879f8 100644
--- a/prettier.config.js
+++ b/prettier.config.js
@@ -1,10 +1,11 @@
 module.exports = {
-    tabWidth: 4,
-    semi: false,
-    vueIndentScriptAndStyle: false,
-    singleQuote: true,
-    trailingComma: 'all',
+    tabWidth: 4,  // 每行缩进 默认为2  这里设置4 
+    semi: false, //  是否在语句末尾添加分号
+    vueIndentScriptAndStyle: false, // 控制 Vue 文件的 <script> 和 <style> 标签下的代码是否需要缩进s
+    singleQuote: true, //  是否使用单引号而不是双引号，‌默认值为 false
+    trailingComma: 'all',  // 控制是否在多行表达式末尾添加尾逗号，‌可选值有 none、‌es5（‌仅在对象、‌数组字面量中添加尾逗号以兼容 ES5）‌或 all（‌在对象、‌数组字面量末尾添加尾逗号）‌
     proseWrap: 'never',
     htmlWhitespaceSensitivity: 'strict',
     endOfLine: 'auto',
+    arrowParens: 'avoid' // 控制单参数的箭头函数是否需要括号，‌可选值有 avoid（‌省略括号）‌或 always（‌始终使用括号）‌
 }
diff --git a/src/api/BasicManage/ProtocolManage.js b/src/api/base/agreement.js
similarity index 100%
rename from src/api/BasicManage/ProtocolManage.js
rename to src/api/base/agreement.js
diff --git a/src/api/BasicManage/ContactUnits.js b/src/api/base/contun.js
similarity index 100%
rename from src/api/BasicManage/ContactUnits.js
rename to src/api/base/contun.js
diff --git a/src/api/BasicManage/Project.js b/src/api/base/project.js
similarity index 100%
rename from src/api/BasicManage/Project.js
rename to src/api/base/project.js
diff --git a/src/api/BasicManage/UnitType.js b/src/api/base/unitType.js
similarity index 100%
rename from src/api/BasicManage/UnitType.js
rename to src/api/base/unitType.js
diff --git a/src/router/index.js b/src/router/index.js
index 0ad2ce4..821607b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -74,25 +74,25 @@ export const constantRoutes = [
       },
       {
         path: 'ProjectManage',
-        component: () => import('@/views/BasicManage/ProjectManage'),
+        component: () => import('@/views/base/project'),
         name: 'ProjectManage',
         meta: { title: '工程管理', icon: 'dashboard', affix: true }
       },
       {
         path: 'ContactUnits',
-        component: () => import('@/views/BasicManage/ContactUnits'),
+        component: () => import('@/views/base/contun'),
         name: 'ContactUnits',
         meta: { title: '往来单位', icon: 'dashboard', affix: true }
       },
       {
         path: 'UnitType',
-        component: () => import('@/views/BasicManage/UnitType'),
+        component: () => import('@/views/base/unitType'),
         name: 'UnitType',
         meta: { title: '单位类型', icon: 'dashboard', affix: true }
       },
       {
         path: 'ProtocolManage',
-        component: () => import('@/views/BasicManage/ProtocolManage'),
+        component: () => import('@/views/base/agreement'),
         name: 'ProtocolManage',
         meta: { title: '协议管理', icon: 'dashboard', affix: true }
       }
diff --git a/src/views/BasicManage/mixins/common.js b/src/views/base/Mixins/common.js
similarity index 100%
rename from src/views/BasicManage/mixins/common.js
rename to src/views/base/Mixins/common.js
diff --git a/src/views/BasicManage/ProtocolManage/components/form-protocol.vue b/src/views/base/agreement/components/form-protocol.vue
similarity index 100%
rename from src/views/BasicManage/ProtocolManage/components/form-protocol.vue
rename to src/views/base/agreement/components/form-protocol.vue
diff --git a/src/views/BasicManage/ProtocolManage/config.js b/src/views/base/agreement/config.js
similarity index 100%
rename from src/views/BasicManage/ProtocolManage/config.js
rename to src/views/base/agreement/config.js
diff --git a/src/views/BasicManage/ProtocolManage/index.vue b/src/views/base/agreement/index.vue
similarity index 100%
rename from src/views/BasicManage/ProtocolManage/index.vue
rename to src/views/base/agreement/index.vue
diff --git a/src/views/base/company/index.vue b/src/views/base/company/index.vue
new file mode 100644
index 0000000..4ca8e83
--- /dev/null
+++ b/src/views/base/company/index.vue
@@ -0,0 +1,10 @@
+<template>
+    <!-- 分公司管理 -->
+    <div> 分公司管理 </div>
+</template>
+
+<script>
+export default {}
+</script>
+
+<style></style>
diff --git a/src/views/BasicManage/ContactUnits/components/form-contact-units.vue b/src/views/base/contun/components/form-contact-units.vue
similarity index 100%
rename from src/views/BasicManage/ContactUnits/components/form-contact-units.vue
rename to src/views/base/contun/components/form-contact-units.vue
diff --git a/src/views/BasicManage/ContactUnits/config.js b/src/views/base/contun/config.js
similarity index 100%
rename from src/views/BasicManage/ContactUnits/config.js
rename to src/views/base/contun/config.js
diff --git a/src/views/BasicManage/ContactUnits/index.vue b/src/views/base/contun/index.vue
similarity index 100%
rename from src/views/BasicManage/ContactUnits/index.vue
rename to src/views/base/contun/index.vue
diff --git a/src/views/BasicManage/EquipmentSupplier/index.vue b/src/views/base/masupplier/index.vue
similarity index 76%
rename from src/views/BasicManage/EquipmentSupplier/index.vue
rename to src/views/base/masupplier/index.vue
index b77d0e5..acf4912 100644
--- a/src/views/BasicManage/EquipmentSupplier/index.vue
+++ b/src/views/base/masupplier/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <!-- 机具供应商 -->
+    <!-- 机具供应商管理 -->
     <div> 机具供应商 </div>
 </template>
 
diff --git a/src/views/BasicManage/ProjectManage/components/form-project.vue b/src/views/base/project/components/form-project.vue
similarity index 100%
rename from src/views/BasicManage/ProjectManage/components/form-project.vue
rename to src/views/base/project/components/form-project.vue
diff --git a/src/views/BasicManage/ProjectManage/config.js b/src/views/base/project/config.js
similarity index 100%
rename from src/views/BasicManage/ProjectManage/config.js
rename to src/views/base/project/config.js
diff --git a/src/views/BasicManage/ProjectManage/index.vue b/src/views/base/project/index.vue
similarity index 100%
rename from src/views/BasicManage/ProjectManage/index.vue
rename to src/views/base/project/index.vue
diff --git a/src/views/BasicManage/UnitType/components/form-units-type.vue b/src/views/base/unitType/components/form-units-type.vue
similarity index 100%
rename from src/views/BasicManage/UnitType/components/form-units-type.vue
rename to src/views/base/unitType/components/form-units-type.vue
diff --git a/src/views/BasicManage/UnitType/config.js b/src/views/base/unitType/config.js
similarity index 100%
rename from src/views/BasicManage/UnitType/config.js
rename to src/views/base/unitType/config.js
diff --git a/src/views/BasicManage/UnitType/index.vue b/src/views/base/unitType/index.vue
similarity index 100%
rename from src/views/BasicManage/UnitType/index.vue
rename to src/views/base/unitType/index.vue