diff --git a/index.html b/index.html
index 72c6ba3d5..58100d3ba 100644
--- a/index.html
+++ b/index.html
@@ -52,15 +52,15 @@
border: 3px solid transparent;
/* COLOR 1 */
border-top-color: #FFF;
- -webkit-animation: spin 2s linear infinite;
+ -webkit-animation: spin 1s linear infinite;
/* Chrome, Opera 15+, Safari 5+ */
- -ms-animation: spin 2s linear infinite;
+ -ms-animation: spin 1s linear infinite;
/* Chrome, Opera 15+, Safari 5+ */
- -moz-animation: spin 2s linear infinite;
+ -moz-animation: spin 1s linear infinite;
/* Chrome, Opera 15+, Safari 5+ */
- -o-animation: spin 2s linear infinite;
+ -o-animation: spin 1s linear infinite;
/* Chrome, Opera 15+, Safari 5+ */
- animation: spin 2s linear infinite;
+ animation: spin 1s linear infinite;
/* Chrome, Firefox 16+, IE 10+, Opera */
z-index: 1001;
}
@@ -76,15 +76,15 @@
border: 3px solid transparent;
/* COLOR 2 */
border-top-color: #FFF;
- -webkit-animation: spin 3s linear infinite;
+ -webkit-animation: spin 1s linear infinite;
/* Chrome, Opera 15+, Safari 5+ */
- -moz-animation: spin 3s linear infinite;
+ -moz-animation: spin 1s linear infinite;
/* Chrome, Opera 15+, Safari 5+ */
- -o-animation: spin 3s linear infinite;
+ -o-animation: spin 1s linear infinite;
/* Chrome, Opera 15+, Safari 5+ */
- -ms-animation: spin 3s linear infinite;
+ -ms-animation: spin 1s linear infinite;
/* Chrome, Opera 15+, Safari 5+ */
- animation: spin 3s linear infinite;
+ animation: spin 1s linear infinite;
/* Chrome, Firefox 16+, IE 10+, Opera */
}
diff --git a/package-lock.json b/package-lock.json
index 325cc9fa0..4feaee9ac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1567,14 +1567,19 @@
"integrity": "sha1-rId6p2qcRTaMl5Rx5GG1INOObPU="
},
"vxe-table": {
- "version": "4.0.0-beta.10",
- "resolved": "http://192.168.250.101:4873/vxe-table/-/vxe-table-4.0.0-beta.10.tgz",
- "integrity": "sha1-kLeS8zRh+VHxWloNsDN/zc4fxGY="
+ "version": "4.0.7-beta.4",
+ "resolved": "http://192.168.250.101:4873/vxe-table/-/vxe-table-4.0.7-beta.4.tgz",
+ "integrity": "sha1-scanU3yNmioYybtEwqF0GNYAEok="
+ },
+ "xe-ajax": {
+ "version": "4.0.5",
+ "resolved": "http://192.168.250.101:4873/xe-ajax/-/xe-ajax-4.0.5.tgz",
+ "integrity": "sha1-N2kPiaN9m19U7yrk79PpJXDzLfM="
},
"xe-utils": {
- "version": "3.1.8",
- "resolved": "http://192.168.250.101:4873/xe-utils/-/xe-utils-3.1.8.tgz",
- "integrity": "sha1-I2mxYblYwPi9R9nA/rNZCSCIcPE="
+ "version": "3.1.12",
+ "resolved": "http://192.168.250.101:4873/xe-utils/-/xe-utils-3.1.12.tgz",
+ "integrity": "sha1-YTfxGrvSJu0DXMAmfWkZHwpFQaM="
},
"xgplayer": {
"version": "2.18.3",
diff --git a/package.json b/package.json
index 59dc5f363..1a752fd9f 100644
--- a/package.json
+++ b/package.json
@@ -28,8 +28,9 @@
"vue-router": "^4.0.4",
"vuedraggable": "^4.0.1",
"vuex": "^4.0.0",
- "vxe-table": "^4.0.0-beta.10",
- "xe-utils": "^3.1.8",
+ "vxe-table": "^4.0.7-beta.4",
+ "xe-ajax": "^4.0.5",
+ "xe-utils": "^3.1.12",
"xgplayer": "^2.18.3"
},
"devDependencies": {
diff --git a/src/main.ts b/src/main.ts
index b5541ef80..7c521479c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -9,7 +9,6 @@ import ElementPlus from 'element-plus'
import 'element-plus/lib/theme-chalk/index.css'
// 内置vxe-table
-import 'xe-utils'
import VXETable from 'vxe-table'
import 'vxe-table/lib/style.css'
diff --git a/src/views/user.vue b/src/views/user.vue
index 5c09e54e0..b9d9cb2ad 100644
--- a/src/views/user.vue
+++ b/src/views/user.vue
@@ -1,12 +1,423 @@
- 用户管理页面
+