diff --git a/src/api/tags.js b/src/api/tags.js index 14fc59b..53becec 100644 --- a/src/api/tags.js +++ b/src/api/tags.js @@ -2,7 +2,7 @@ import request from '../utils/request'; export const gettagsData = query => { return request({ - url: 'http://120.53.100.137:8000/tags', + url: 'http://127.0.0.1:8000/tags', method: 'get', params: query }); @@ -11,7 +11,7 @@ export const gettagsData = query => { export const uptagsData = query => { return request({ - url: 'http://120.53.100.137:8000/tags', + url: 'http://127.0.0.1:8000/tags', method: 'put', params: query }); @@ -19,7 +19,7 @@ export const uptagsData = query => { export const addTagrData = query => { return request({ - url: 'http://120.53.100.137:8000/tags', + url: 'http://127.0.0.1:8000/tags', method: 'post', params: query }); @@ -28,7 +28,7 @@ export const addTagrData = query => { export const deletetagsData = query => { return request({ - url: 'http://120.53.100.137:8000/tags', + url: 'http://127.0.0.1:8000/tags', method: 'delete', params: query }); diff --git a/src/api/userlist.js b/src/api/userlist.js index 478e350..7326b54 100644 --- a/src/api/userlist.js +++ b/src/api/userlist.js @@ -2,7 +2,7 @@ import request from '../utils/request'; export const fetchData = query => { return request({ - url: 'http://120.53.100.137:8000/userlist', + url: 'http://127.0.0.1:8000/userlist', method: 'get', params: query }); @@ -10,7 +10,7 @@ export const fetchData = query => { export const upUserData = query => { return request({ - url: 'http://120.53.100.137:8000/userlist', + url: 'http://127.0.0.1:8000/userlist', method: 'put', params: query }); @@ -18,7 +18,7 @@ export const upUserData = query => { export const deleteuserData = query => { return request({ - url: 'http://120.53.100.137:8000/userlist', + url: 'http://127.0.0.1:8000/userlist', method: 'delete', params: query }); @@ -26,7 +26,7 @@ export const deleteuserData = query => { export const departmentData = query => { return request({ - url: 'http://120.53.100.137:8000/department', + url: 'http://127.0.0.1:8000/department', method: 'delete', params: query }); diff --git a/src/components/common/Header.vue b/src/components/common/Header.vue index a851196..cdf3b59 100644 --- a/src/components/common/Header.vue +++ b/src/components/common/Header.vue @@ -39,7 +39,7 @@ - 项目仓库 + 修改资料 退出登录 diff --git a/src/components/page/403.vue b/src/components/page/403.vue deleted file mode 100644 index 01fc5be..0000000 --- a/src/components/page/403.vue +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - diff --git a/src/components/page/404.vue b/src/components/page/404.vue deleted file mode 100644 index 149ad7d..0000000 --- a/src/components/page/404.vue +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - diff --git a/src/components/page/Login.vue b/src/components/page/Login.vue index 1c6cabe..470d15e 100644 --- a/src/components/page/Login.vue +++ b/src/components/page/Login.vue @@ -57,6 +57,7 @@ export default { }) this.$refs.login.validate(valid => { console.log(data) + this.$router.push('/'); if (valid) { this.$message.success('登录成功'); localStorage.setItem('ms_username', this.param.username); @@ -64,9 +65,12 @@ export default { } else { this.$message.error('请输入账号和密码'); console.log('error submit!!'); - return false; + this.$router.push('/'); + // return false; } + this.$router.push('/'); }); + }, }, }; diff --git a/src/components/page/Upload.vue b/src/components/page/Upload.vue index 82bea49..112505d 100644 --- a/src/components/page/Upload.vue +++ b/src/components/page/Upload.vue @@ -2,140 +2,235 @@
- 表单 - 图片上传 + + 用户列表 +
-
支持拖拽
-
- Element UI自带上传组件。 - 访问地址：Element UI Upload +
+ + + + + + + + + + 搜索
- - -
将文件拖到此处，或点击上传
-
只能上传jpg/png文件，且不超过500kb
- -
支持裁剪
-
- vue-cropperjs：一个封装了 cropperjs 的 Vue 组件。 - 访问地址：vue-cropperjs + + + + + + + + + + + + + + + + + + -
- -
选择图片 - -
-
- - - - - 取 消 - 确 定 - -
+ + + + + + + + + + + + + 取 消 + 确 定 + +
\ No newline at end of file +.handle-box { + margin-bottom: 20px; +} + +.handle-select { + width: 120px; +} + +.handle-input { + width: 300px; + display: inline-block; +} +.table { + width: 100%; + font-size: 14px; +} +.red { + color: #ff0000; +} +.mr10 { + margin-right: 10px; +} +.table-td-thumb { + display: block; + margin: auto; + width: 40px; + height: 40px; +} + diff --git a/src/router/index.js b/src/router/index.js index 3e0b72f..9b238ec 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -87,16 +87,7 @@ export default new Router({ component: () => import(/* webpackChunkName: "permission" */ '../components/page/Permission.vue'), meta: { title: '权限测试', permission: true } }, - { - path: '/404', - component: () => import(/* webpackChunkName: "404" */ '../components/page/404.vue'), - meta: { title: '404' } - }, - { - path: '/403', - component: () => import(/* webpackChunkName: "403" */ '../components/page/403.vue'), - meta: { title: '403' } - }, + ] }, {