From 124666cca615de17d1f32c3297ad5956cbc22d3f Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 9 Feb 2022 16:13:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=B7=AF=E7=94=B1=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage.vue          |  1 -
 .../assets/js/pages/manage/setting/index.vue  |  1 -
 .../pages/manage/setting/preference/index.vue | 25 ----------------
 .../{preference => system}/columnTemplate.vue |  6 ++--
 .../js/pages/manage/setting/system/index.vue  | 29 +++++++++++++++++++
 .../{system.vue => system/setting.vue}        |  4 ++-
 .../{preference => system}/taskPriority.vue   |  4 +--
 resources/assets/js/routes.js                 |  7 +----
 resources/assets/sass/pages/page-setting.scss |  3 +-
 9 files changed, 39 insertions(+), 41 deletions(-)
 delete mode 100644 resources/assets/js/pages/manage/setting/preference/index.vue
 rename resources/assets/js/pages/manage/setting/{preference => system}/columnTemplate.vue (95%)
 create mode 100644 resources/assets/js/pages/manage/setting/system/index.vue
 rename resources/assets/js/pages/manage/setting/{system.vue => system/setting.vue} (98%)
 rename resources/assets/js/pages/manage/setting/{preference => system}/taskPriority.vue (98%)

diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index d9e814ac..cb95768d 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -376,7 +376,6 @@ export default {
                     {path: 'password', name: '密码设置'},
                     {path: 'clearCache', name: '清除缓存'},
                     {path: 'system', name: '系统设置', divided: true},
-                    {path: 'preference', name: '偏好设置'},
                     {path: 'workReport', name: '工作报告', divided: true},
                     {path: 'allUser', name: '团队管理'},
                     {path: 'allProject', name: '所有项目'},
diff --git a/resources/assets/js/pages/manage/setting/index.vue b/resources/assets/js/pages/manage/setting/index.vue
index aed9061a..0d804e46 100644
--- a/resources/assets/js/pages/manage/setting/index.vue
+++ b/resources/assets/js/pages/manage/setting/index.vue
@@ -56,7 +56,6 @@ export default {
             if (this.userIsAdmin) {
                 menu.push(...[
                     {path: 'system', name: '系统设置', divided: true},
-                    {path: 'preference', name: '偏好设置'},
                 ])
             }
             return menu;
diff --git a/resources/assets/js/pages/manage/setting/preference/index.vue b/resources/assets/js/pages/manage/setting/preference/index.vue
deleted file mode 100644
index 17c770f7..00000000
--- a/resources/assets/js/pages/manage/setting/preference/index.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-    <div class="setting-item submit">
-        <Tabs v-model="tabAction">
-            <TabPane :label="$L('任务优先级')" name="priority">
-                <PreferenceTaskPriority/>
-            </TabPane>
-            <TabPane :label="$L('新建项目模板')" name="columnTemplate">
-                <PreferenceColumnTemplate/>
-            </TabPane>
-        </Tabs>
-    </div>
-</template>
-
-<script>
-import PreferenceTaskPriority from "./taskPriority";
-import PreferenceColumnTemplate from "./columnTemplate";
-export default {
-    components: {PreferenceColumnTemplate, PreferenceTaskPriority},
-    data() {
-        return {
-            tabAction: 'priority',
-        }
-    },
-}
-</script>
diff --git a/resources/assets/js/pages/manage/setting/preference/columnTemplate.vue b/resources/assets/js/pages/manage/setting/system/columnTemplate.vue
similarity index 95%
rename from resources/assets/js/pages/manage/setting/preference/columnTemplate.vue
rename to resources/assets/js/pages/manage/setting/system/columnTemplate.vue
index 0aca2d3d..7bce7456 100644
--- a/resources/assets/js/pages/manage/setting/preference/columnTemplate.vue
+++ b/resources/assets/js/pages/manage/setting/system/columnTemplate.vue
@@ -1,9 +1,9 @@
 <template>
-    <div class="preference-project-create">
+    <div class="setting-system-item">
         <Form ref="formDatum" label-width="auto" @submit.native.prevent>
             <Row class="setting-template">
                 <Col span="8">{{$L('名称')}}</Col>
-                <Col span="16">{{$L('列表模板')}}</Col>
+                <Col span="16">{{$L('项目模板')}}</Col>
             </Row>
             <Row v-for="(item, key) in formDatum" :key="key" class="setting-template">
                 <Col span="8">
@@ -31,7 +31,7 @@
 import {mapState} from "vuex";
 
 export default {
-    name: 'PreferenceColumnTemplate',
+    name: 'SystemColumnTemplate',
     data() {
         return {
             loadIng: 0,
diff --git a/resources/assets/js/pages/manage/setting/system/index.vue b/resources/assets/js/pages/manage/setting/system/index.vue
new file mode 100644
index 00000000..b5921027
--- /dev/null
+++ b/resources/assets/js/pages/manage/setting/system/index.vue
@@ -0,0 +1,29 @@
+<template>
+    <div class="setting-item submit">
+        <Tabs v-model="tabAction">
+            <TabPane :label="$L('系统设置')" name="setting">
+                <SystemSetting/>
+            </TabPane>
+            <TabPane :label="$L('任务优先级')" name="taskPriority">
+                <SystemTaskPriority/>
+            </TabPane>
+            <TabPane :label="$L('项目模板')" name="columnTemplate">
+                <SystemColumnTemplate/>
+            </TabPane>
+        </Tabs>
+    </div>
+</template>
+
+<script>
+import SystemSetting from "./setting";
+import SystemTaskPriority from "./taskPriority";
+import SystemColumnTemplate from "./columnTemplate";
+export default {
+    components: {SystemColumnTemplate, SystemTaskPriority, SystemSetting},
+    data() {
+        return {
+            tabAction: 'setting',
+        }
+    },
+}
+</script>
diff --git a/resources/assets/js/pages/manage/setting/system.vue b/resources/assets/js/pages/manage/setting/system/setting.vue
similarity index 98%
rename from resources/assets/js/pages/manage/setting/system.vue
rename to resources/assets/js/pages/manage/setting/system/setting.vue
index 1f905a8d..ff2fa76a 100644
--- a/resources/assets/js/pages/manage/setting/system.vue
+++ b/resources/assets/js/pages/manage/setting/system/setting.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="setting-item submit">
+    <div class="setting-system-item">
         <Form ref="formDatum" :model="formDatum" label-width="auto" @submit.native.prevent>
             <FormItem :label="$L('允许注册')" prop="reg">
                 <RadioGroup v-model="formDatum.reg">
@@ -69,6 +69,8 @@
 
 <script>
 export default {
+    name: 'SystemSetting',
+
     data() {
         return {
             loadIng: 0,
diff --git a/resources/assets/js/pages/manage/setting/preference/taskPriority.vue b/resources/assets/js/pages/manage/setting/system/taskPriority.vue
similarity index 98%
rename from resources/assets/js/pages/manage/setting/preference/taskPriority.vue
rename to resources/assets/js/pages/manage/setting/system/taskPriority.vue
index b08c7d79..7cb9ea22 100644
--- a/resources/assets/js/pages/manage/setting/preference/taskPriority.vue
+++ b/resources/assets/js/pages/manage/setting/system/taskPriority.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="preference-task-priority">
+    <div class="setting-system-item">
         <Form ref="formDatum" label-width="auto" @submit.native.prevent>
             <Row class="setting-color">
                 <Col span="12">{{$L('名称')}}</Col>
@@ -47,7 +47,7 @@
 import {mapState} from "vuex";
 
 export default {
-    name: 'PreferenceTaskPriority',
+    name: 'SystemTaskPriority',
     data() {
         return {
             loadIng: 0,
diff --git a/resources/assets/js/routes.js b/resources/assets/js/routes.js
index 9c4ea794..1793f258 100755
--- a/resources/assets/js/routes.js
+++ b/resources/assets/js/routes.js
@@ -49,12 +49,7 @@ export default [
                     {
                         name: 'manage-setting-system',
                         path: 'system',
-                        component: () => import('./pages/manage/setting/system.vue'),
-                    },
-                    {
-                        name: 'manage-setting-preference',
-                        path: 'preference',
-                        component: () => import('./pages/manage/setting/preference/index.vue'),
+                        component: () => import('./pages/manage/setting/system/index.vue'),
                     },
                 ]
             },
diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss
index 5e5bcfd3..98cb7f46 100755
--- a/resources/assets/sass/pages/page-setting.scss
+++ b/resources/assets/sass/pages/page-setting.scss
@@ -187,8 +187,7 @@
                     height: 0;
                     .ivu-tabs-tabpane {
                         position: relative;
-                        .preference-task-priority,
-                        .preference-project-create {
+                        .setting-system-item {
                             position: absolute;
                             top: 0;
                             left: 0;