diff --git a/README.md b/README.md
index 2684560693d04d3252fb259e7c2c34684371af5b..7344e31dae778b4ca9e8c1e920a527940a6f2ba7 100644
--- a/README.md
+++ b/README.md
@@ -27,3 +27,6 @@ $ npm run serve
### 说明
用户名/密码:admin/666666
+
+ css 工具函数 地址
+ https://www.tailwindcss.cn/docs/installation#post-css-7
diff --git a/package.json b/package.json
index 6fa200d2f9555a2ac65e574388357edc48395ace..ed7ffbadc75690056f6a27e727b90629e9964c76 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
},
"dependencies": {
"@antv/data-set": "^0.11.4",
+ "@tailwindcss/postcss7-compat": "^2.2.2",
"animate.css": "^4.1.0",
"ant-design-vue": "1.7.2",
"axios": "^0.19.2",
@@ -26,6 +27,7 @@
"js-cookie": "^2.2.1",
"mockjs": "^1.1.0",
"nprogress": "^0.2.0",
+ "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.2",
"viser-vue": "^2.4.8",
"vue": "^2.6.11",
"vue-i18n": "^8.18.2",
diff --git a/src/components/index.js b/src/components/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..f49b5a1f4916b9918cdf74d759e8f1a8dfe62924
--- /dev/null
+++ b/src/components/index.js
@@ -0,0 +1,3 @@
+import Table from './table/index.vue';
+
+export { Table };
diff --git a/src/components/page/PageHeader.vue b/src/components/page/PageHeader.vue
index ae2c4bafb43a56801839cb9b637935de2a811323..85dc6d35c85c647f683b233ab67a0c1843881fda 100644
--- a/src/components/page/PageHeader.vue
+++ b/src/components/page/PageHeader.vue
@@ -1,35 +1,10 @@
@@ -63,43 +38,11 @@ export default {
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..7f6b4a91ecc281ec4fa179acad89f4c345d1178e
--- /dev/null
+++ b/src/components/table/index.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+ {{ addBtn.text || '新建' }}
+
+
+ {{ btn.text }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main.js b/src/main.js
index 6a586cdc0c9be107b4adc498258ccfbd7cdf6dfb..1683c72531e4c1b0c1f90c2ffde3f175f46789d4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,6 +7,7 @@ import { initRouter } from './router';
import VueI18n from 'vue-i18n';
import {accountModule, settingModule} from './pages/frame/store';
import App from './App.vue';
+import "tailwindcss/tailwind.css"
import 'animate.css/source/animate.css';
import './theme/index.less';
diff --git a/src/mock/frame/tableDataMock.js b/src/mock/frame/tableDataMock.js
new file mode 100644
index 0000000000000000000000000000000000000000..c04b95a02d4e83837662b930d55fb005f2a12c3b
--- /dev/null
+++ b/src/mock/frame/tableDataMock.js
@@ -0,0 +1,58 @@
+import Mock from 'mockjs';
+
+Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/table`, 'post', () => ({
+ data: {
+ pageNum: 1,
+ pageSize: 10,
+ records: [
+ {
+ regionId: 1403455275008032,
+ regionName: '陈浩玮',
+ organizationId: 146,
+ organizationName: '一级系统:巴基斯坦公司',
+ remark: '123',
+ editorId: 1,
+ editorName: '管理员',
+ editTime: '2021-03-16 22:20:25',
+ },
+ {
+ regionId: 1403455136596000,
+ regionName: '地点测试',
+ organizationId: 212,
+ organizationName: '吴国',
+ remark: '123',
+ editorId: 1,
+ editorName: '管理员',
+ editTime: '2021-03-16 22:19:19',
+ },
+ {
+ regionId: 1400871246102560,
+ regionName: '陈浩玮测试',
+ organizationId: 212,
+ organizationName: '吴国',
+ remark: '321',
+ editorId: 1,
+ editorName: '管理员',
+ editTime: '2021-03-02 16:04:25',
+ },
+ {
+ regionId: 1396338094768160,
+ regionName: '文件地区',
+ organizationId: 208,
+ organizationName: '扩普发展',
+ remark: '123213123123213213223123123',
+ editorId: 1,
+ editorName: '管理员',
+ editTime: '2021-03-02 15:37:11',
+ },
+ ],
+ total: 4,
+ size: 10,
+ current: 1,
+ pages: 1,
+ },
+ code: 'sys.success',
+ message: null,
+ traceId: '1805b654e82a4f2a8357d2f8922d9b19',
+ meta: null,
+}));
diff --git a/src/pages/frame/layouts/PageLayout.vue b/src/pages/frame/layouts/PageLayout.vue
index d0597261e09f17ce60d446fefbc36960c697a5c3..7b4df31cece79caafc77af3426fcc61821b55572 100644
--- a/src/pages/frame/layouts/PageLayout.vue
+++ b/src/pages/frame/layouts/PageLayout.vue
@@ -1,15 +1,20 @@
-
+
@@ -76,7 +81,7 @@ export default {
let breadcrumb = page && page.breadcrumb;
if (breadcrumb) {
let i18nBreadcrumb = [];
- breadcrumb.forEach((item) => {
+ breadcrumb.forEach(item => {
i18nBreadcrumb.push(this.$t(item));
});
return i18nBreadcrumb;
@@ -95,8 +100,8 @@ export default {
const path = this.$route.path;
let breadcrumb = [];
routes
- .filter((item) => path.includes(item.path))
- .forEach((route) => {
+ .filter(item => path.includes(item.path))
+ .forEach(route => {
const path = route.path.length === 0 ? '/home' : route.path;
breadcrumb.push(this.$t(getI18nKey(path)));
});
@@ -119,11 +124,7 @@ export default {