From cd74de78247ad8ac11033c354cfa88e28868913f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B0=B4=E8=90=BD=28YangLei=29?= <lzi.love@icloud.com>
Date: Wed, 7 Jul 2021 17:32:15 +0800
Subject: [PATCH] feat: autoprefixer

---
 package.json                                  |  1 +
 src/components/table/index.vue                |  2 +-
 src/components/table/table.vue                |  9 ++++
 .../frame/components/tab/LayoutTabsHeader.vue | 11 ++---
 .../xunjian/task_managment/center/form.vue    |  3 ++
 .../xunjian/task_managment/center/index.js    |  3 ++
 .../xunjian/task_managment/center/index.vue   | 49 +++++++++++++++++++
 src/pages/xunjian/view/area/index.vue         | 25 ----------
 src/router/config.js                          | 21 +++++++-
 vue.config.js                                 |  2 +-
 10 files changed, 91 insertions(+), 35 deletions(-)
 create mode 100644 src/pages/xunjian/task_managment/center/form.vue
 create mode 100644 src/pages/xunjian/task_managment/center/index.js
 create mode 100644 src/pages/xunjian/task_managment/center/index.vue
 delete mode 100644 src/pages/xunjian/view/area/index.vue

diff --git a/package.json b/package.json
index 944315e..6c89ec3 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
     "@vue/cli-plugin-eslint": "^4.4.0",
     "@vue/cli-service": "^4.4.0",
     "@vuepress/plugin-back-to-top": "^1.5.2",
+    "autoprefixer": "^9.8.6",
     "babel-eslint": "^10.1.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "babel-polyfill": "^6.26.0",
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index b8055f0..3796120 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -69,7 +69,7 @@
                 </a-space>
             </template>
         </a-drawer>
-        <slot name="children"></slot>
+        <slot name="children" />
     </div>
 </template>
 
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index b5921bf..7718106 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -9,6 +9,13 @@
 
             <div class="tw-text-right tw-mt-2">
                 <a-space>
+                    <a-popover title="Title">
+                        <template slot="content">
+                            <p>Content</p>
+                            <p>Content</p>
+                        </template>
+                        <a-button>高级查询</a-button>
+                    </a-popover>
                     <a-button @click="reset">重置</a-button>
                     <a-button type="primary" @click="getData">查询</a-button>
                 </a-space>
@@ -27,6 +34,7 @@
                 :data-source="data"
                 :loading="loading"
                 v-bind="$attrs"
+                :rowKey="rowKey"
                 :pagination="pagination"
                 @change="pageChange"
             >
@@ -69,6 +77,7 @@ export default {
         buttons: Array,
         noPage: Boolean,
         formatData: Function,
+        rowKey: [String, Function],
     },
 
     data() {
diff --git a/src/pages/frame/components/tab/LayoutTabsHeader.vue b/src/pages/frame/components/tab/LayoutTabsHeader.vue
index 4b6f384..081fdd1 100644
--- a/src/pages/frame/components/tab/LayoutTabsHeader.vue
+++ b/src/pages/frame/components/tab/LayoutTabsHeader.vue
@@ -15,7 +15,9 @@
                     :class="['icon-sync', { hide: page.fullPath !== active && !page.loading }]"
                     :type="page.loading ? 'loading' : 'sync'"
                 />
-                <div class="title" @click="onTabClick(page.fullPath)">{{ pageName(page) }}</div>
+                <div class="tw-inline-block tw-select-none tw-h-full" @click="onTabClick(page.fullPath)">
+                    {{ pageName(page) }}
+                </div>
                 <a-icon
                     v-if="!page.unclose"
                     @click="onClose(page.fullPath)"
@@ -102,12 +104,7 @@ export default {
     font-size: 14px;
     user-select: none;
     transition: all 0.2s;
-    .title {
-        display: inline-block;
-        height: 100%;
-        user-select: none;
-        -webkit-user-select: none;
-    }
+
     .icon-close {
         font-size: 12px;
         margin-left: 6px;
diff --git a/src/pages/xunjian/task_managment/center/form.vue b/src/pages/xunjian/task_managment/center/form.vue
new file mode 100644
index 0000000..a2e32df
--- /dev/null
+++ b/src/pages/xunjian/task_managment/center/form.vue
@@ -0,0 +1,3 @@
+<template>
+    <h1>新增</h1>
+</template>
diff --git a/src/pages/xunjian/task_managment/center/index.js b/src/pages/xunjian/task_managment/center/index.js
new file mode 100644
index 0000000..63b68b8
--- /dev/null
+++ b/src/pages/xunjian/task_managment/center/index.js
@@ -0,0 +1,3 @@
+import Center from './index.vue';
+
+export default Center;
diff --git a/src/pages/xunjian/task_managment/center/index.vue b/src/pages/xunjian/task_managment/center/index.vue
new file mode 100644
index 0000000..5f72a30
--- /dev/null
+++ b/src/pages/xunjian/task_managment/center/index.vue
@@ -0,0 +1,49 @@
+<template>
+    <Table url="/ranger/inspection/api/v1/jobs" :buttons="buttons" rowKey="jobId" addBtn>
+        <template #search="{query}">
+            <my-form-item label="开始时间">
+                <a-date-picker
+                    class="tw-w-full"
+                    show-time
+                    v-model="query.startTime"
+                    valueFormat="YYYY-MM-DD HH:mm:ss"
+                />
+            </my-form-item>
+        </template>
+
+        <template #drawer="hidden">
+            <Form :hidden="hidden" />
+        </template>
+
+        <a-table-column title="线路名称" data-index="routeName" />
+        <a-table-column title="专业" data-index="specialityName" />
+        <a-table-column title="地区" data-index="regionName" />
+        <a-table-column title="班组" data-index="shiftTypeName" />
+        <a-table-column title="任务时间" data-index="jobTime" />
+        <a-table-column title="巡检状态" data-index="inspectionStateName" />
+        <a-table-column title="任务类型" data-index="jobTypeName" />
+        <a-table-column title="巡检开始时间" data-index="inspectionStartTime" />
+        <a-table-column title="巡检结束时间" data-index="inspectionEndTime" />
+        <a-table-column title="巡检人" data-index="lastInspectionStaffName" />
+    </Table>
+</template>
+
+<script>
+import Table from '@/components/table/table.vue';
+import Form from './form.vue';
+
+export default {
+    components: { Table, Form },
+    data() {
+        return {
+            buttons: [
+                {
+                    label: '详情',
+                },
+                { label: '进度' },
+                { type: 'confirm' },
+            ],
+        };
+    },
+};
+</script>
diff --git a/src/pages/xunjian/view/area/index.vue b/src/pages/xunjian/view/area/index.vue
deleted file mode 100644
index db43332..0000000
--- a/src/pages/xunjian/view/area/index.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-    <my-table url="table" :search="search" />
-</template>
-
-<script>
-export default {
-    data: () => ({
-        search: [
-            {
-                type: 'input',
-                key: 'name',
-                label: '所属组织',
-                options: {
-                    placeholder: '请选择所属组织',
-                },
-            },
-            {
-                type: 'input',
-                key: 'address',
-                label: '地区名称',
-            },
-        ],
-    }),
-};
-</script>
diff --git a/src/router/config.js b/src/router/config.js
index 81f30cc..5bf02dd 100644
--- a/src/router/config.js
+++ b/src/router/config.js
@@ -55,6 +55,25 @@ const hasAuthorityRoutes = [
                     },
                 ],
             },
+            {
+                path: 'ranger',
+                name: '巡检管理',
+                component: PageTemplateView,
+                children: [
+                    {
+                        path: 'task',
+                        name: '任务管理',
+                        component: RouterView,
+                        children: [
+                            {
+                                path: 'center',
+                                name: '任务中心',
+                                component: () => import('@/pages/xunjian/task_managment/center/index'),
+                            },
+                        ],
+                    },
+                ],
+            },
             {
                 path: 'system',
                 name: '系统管理',
@@ -131,7 +150,7 @@ const hasAuthorityRoutes = [
                     },
                     {
                         path: 'task',
-                        name: '任务管理',
+                        name: '任务',
                         component: () => import('@/pages/system/view/task/index.vue'),
                     },
                 ],
diff --git a/vue.config.js b/vue.config.js
index 663d87d..df482d5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -281,7 +281,7 @@ module.exports = {
                 },
             },
             postcss: {
-                plugins: [require('tailwindcss')],
+                plugins: [require('tailwindcss'), require('autoprefixer')],
             },
         },
     },
-- 
GitLab