diff --git a/package.json b/package.json index 944315eb014651f5b5dca4767dbd4586fde208c3..6c89ec31d998c7114d386cdd69e678c07f4759a9 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 b8055f064884e77ed2f32fbccfb7c26d06ea7c5a..379612085db065b53e4fbceab7210bd75dc1dba7 100644 --- a/src/components/table/index.vue +++ b/src/components/table/index.vue @@ -69,7 +69,7 @@ - + diff --git a/src/components/table/table.vue b/src/components/table/table.vue index b5921bf654eb00969392970d423b7c8caf665e83..7718106a3612953b7ab3446040212a468c7388bb 100644 --- a/src/components/table/table.vue +++ b/src/components/table/table.vue @@ -9,6 +9,13 @@
+ + + 高级查询 + 重置 查询 @@ -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 4b6f38433cfcdf20bc141ec1993e03bc43f6ecd1..081fdd1b0bfc7f9b3c434cbcbecec25ec9d26b9e 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'" /> -
{{ pageName(page) }}
+
+ {{ pageName(page) }} +
+

新增

+ 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 0000000000000000000000000000000000000000..63b68b8def407dda714507d4716bf563b1d32eb7 --- /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 0000000000000000000000000000000000000000..5f72a3077c9aafb2d2117017c4e33e7792eff411 --- /dev/null +++ b/src/pages/xunjian/task_managment/center/index.vue @@ -0,0 +1,49 @@ + + + diff --git a/src/pages/xunjian/view/area/index.vue b/src/pages/xunjian/view/area/index.vue deleted file mode 100644 index db4333268d3d32a97211a4a5bfe1564ad77b5ae2..0000000000000000000000000000000000000000 --- a/src/pages/xunjian/view/area/index.vue +++ /dev/null @@ -1,25 +0,0 @@ - - - diff --git a/src/router/config.js b/src/router/config.js index 81f30ccfd7d043c6c78b55d1a155b3ff851afbb7..5bf02dd46f0376bd077725616f4fb42272aced0d 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 663d87db35e4d75ed7637aa5abbd7e6b2fd0d64e..df482d55e74de92eb4bfcc6c645744d31a3e2e14 100644 --- a/vue.config.js +++ b/vue.config.js @@ -281,7 +281,7 @@ module.exports = { }, }, postcss: { - plugins: [require('tailwindcss')], + plugins: [require('tailwindcss'), require('autoprefixer')], }, }, },