From 42192dbeb532b2f7113b98fa497b34a63b14b5ff Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Thu, 20 Jun 2024 17:48:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 1 + .env.staging | 10 +- src/icons/svg/home.svg | 1 + src/store/modules/user.js | 272 +++++++++++++++++---------------- src/views/component/detail.vue | 91 +++++++++-- src/views/dashboard/index.vue | 2 +- src/views/dataShow/header.vue | 11 +- src/views/login/index.vue | 25 +-- 8 files changed, 243 insertions(+), 170 deletions(-) create mode 100644 src/icons/svg/home.svg diff --git a/.env.development b/.env.development index c02a891..45c14b8 100644 --- a/.env.development +++ b/.env.development @@ -5,3 +5,4 @@ ENV='development' VUE_APP_BASE_API=http://wuxiwuye.ali251.langye.net/ VUE_APP_UPLOAD_API=http://wuxiwuye.ali251.langye.net/api/admin/upload-file VUE_APP_PREVIEW=http://view.ali251.langye.net:8012/onlinePreview + diff --git a/.env.staging b/.env.staging index c91aa42..262c76b 100644 --- a/.env.staging +++ b/.env.staging @@ -4,6 +4,10 @@ NODE_ENV = production ENV = 'staging' # base api -VUE_APP_BASE_API=http://wuxiwuye.ali251.langye.net/ -VUE_APP_UPLOAD_API=http://wuxiwuye.ali251.langye.net/api/admin/upload-file -VUE_APP_PREVIEW=http://view.ali251.langye.net:8012/onlinePreview +#VUE_APP_BASE_API=http://wuxiwuye.ali251.langye.net/ +#VUE_APP_UPLOAD_API=http://wuxiwuye.ali251.langye.net/api/admin/upload-file +#VUE_APP_PREVIEW=http://view.ali251.langye.net:8012/onlinePreview +# base api +VUE_APP_BASE_API=http://192.168.221.31:9001/ +VUE_APP_UPLOAD_API=http://192.168.221.31:9001/api/admin/upload-file +VUE_APP_PREVIEW=http://192.168.221.31:8012/onlinePreview diff --git a/src/icons/svg/home.svg b/src/icons/svg/home.svg new file mode 100644 index 0000000..98e08bb --- /dev/null +++ b/src/icons/svg/home.svg @@ -0,0 +1 @@ + diff --git a/src/store/modules/user.js b/src/store/modules/user.js index c288974..bf8c44b 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,136 +1,138 @@ -import { - login, - logout, - getInfo -} from '@/api/user' -import { - getToken, - setToken, - removeToken -} from '@/utils/auth' -import { - resetRouter -} from '@/router' - -const getDefaultState = () => { - return { - token: getToken(), - name: '', - avatar: '', - roles: [] - } -} - -const state = getDefaultState() - -const mutations = { - RESET_STATE: (state) => { - Object.assign(state, getDefaultState()) - }, - SET_TOKEN: (state, token) => { - state.token = token - }, - SET_NAME: (state, name) => { - state.name = name - }, - SET_AVATAR: (state, avatar) => { - state.avatar = avatar - }, - SET_ROLES: (state, roles) => { - state.roles = roles - } -} - -const actions = { - // user login - login({ - commit - }, userInfo) { - const { - username, - password - } = userInfo - return new Promise((resolve, reject) => { - login({ - username: username.trim(), - password: password - }).then(response => { - console.log(response) - const { - data - } = response; - console.log(response.access_token) - commit('SET_TOKEN', response.access_token) - setToken(response.access_token) - resolve() - }).catch(error => { - reject(error) - }) - }) - }, - - // get user info - getInfo({ - commit, - state - }) { - return new Promise((resolve, reject) => { - getInfo(state.token).then(response => { - - if (!response) { - reject('身份验证失败请重新登录') - } - response["roles"] = ["admin"]; - const { - roles, - name, - avatar - } = response - - - - commit('SET_ROLES', roles) - commit('SET_NAME', name) - commit('SET_AVATAR', avatar) - resolve(response) - }).catch(error => { - reject(error) - }) - }) - }, - - // user logout - logout({ - commit, - state - }) { - return new Promise((resolve, reject) => { - logout(state.token).then(() => { - removeToken() // must remove token first - resetRouter() - commit('RESET_STATE') - resolve() - }).catch(error => { - reject(error) - }) - }) - }, - - // remove token - resetToken({ - commit - }) { - return new Promise(resolve => { - removeToken() // must remove token first - commit('RESET_STATE') - resolve() - }) - } -} - -export default { - namespaced: true, - state, - mutations, - actions +import { + login, + logout, + getInfo +} from '@/api/user' +import { + getToken, + setToken, + removeToken +} from '@/utils/auth' +import { + resetRouter +} from '@/router' + +const getDefaultState = () => { + return { + token: getToken(), + name: '', + avatar: '', + roles: [] + } +} + +const state = getDefaultState() + +const mutations = { + RESET_STATE: (state) => { + Object.assign(state, getDefaultState()) + }, + SET_TOKEN: (state, token) => { + state.token = token + }, + SET_NAME: (state, name) => { + state.name = name + }, + SET_AVATAR: (state, avatar) => { + state.avatar = avatar + }, + SET_ROLES: (state, roles) => { + state.roles = roles + } +} + +const actions = { + // user login + login({ + commit + }, userInfo) { + const { + username, + password, + code + } = userInfo + return new Promise((resolve, reject) => { + login({ + username: username.trim(), + password: password, + code + }).then(response => { + console.log(response) + const { + data + } = response; + console.log(response.access_token) + commit('SET_TOKEN', response.access_token) + setToken(response.access_token) + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // get user info + getInfo({ + commit, + state + }) { + return new Promise((resolve, reject) => { + getInfo(state.token).then(response => { + + if (!response) { + reject('身份验证失败请重新登录') + } + response["roles"] = ["admin"]; + const { + roles, + name, + avatar + } = response + + + + commit('SET_ROLES', roles) + commit('SET_NAME', name) + commit('SET_AVATAR', avatar) + resolve(response) + }).catch(error => { + reject(error) + }) + }) + }, + + // user logout + logout({ + commit, + state + }) { + return new Promise((resolve, reject) => { + logout(state.token).then(() => { + removeToken() // must remove token first + resetRouter() + commit('RESET_STATE') + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // remove token + resetToken({ + commit + }) { + return new Promise(resolve => { + removeToken() // must remove token first + commit('RESET_STATE') + resolve() + }) + } +} + +export default { + namespaced: true, + state, + mutations, + actions } diff --git a/src/views/component/detail.vue b/src/views/component/detail.vue index a688018..ee4e65e 100644 --- a/src/views/component/detail.vue +++ b/src/views/component/detail.vue @@ -84,7 +84,7 @@ v-for="item in /\/land/g.test($route.path) ? detail.id_asset_picture_files_land_id_relation : detail.id_asset_picture_files_house_id_relation" > 0"> - + @@ -284,6 +320,7 @@ export default { name: "detail", data() { return { + isShowSearch: false, showModal: false, codeUri: "", center: [120.283692, 31.614211], @@ -674,6 +711,42 @@ a:hover { .el-image + .el-image { margin-left: 6px; } + +.search-container-enter-active { + animation: slide-in-fwd-br 0.4s cubic-bezier(0.250, 0.460, 0.450, 0.940) both; + +} +.search-container-leave-active { + animation: slide-out-fwd-br 0.6s cubic-bezier(0.550, 0.085, 0.680, 0.530) both; +} +@keyframes slide-in-fwd-br { + 0% { + transform: translateZ(-1400px) translateY(800px) translateX(1000px); + opacity: 0; + } + 100% { + transform: translateZ(0) translateY(0) translateX(0); + opacity: 1; + } +} +@keyframes slide-out-fwd-br { + 0% { + transform: translateZ(0) translateY(0) translateX(0); + opacity: 1; + } + 100% { + transform: translateZ(600px) translateY(300px) translateX(400px); + opacity: 0; + } +} +.search-container { + min-width: 300px; + background: #fff; + + position: fixed; + right: 100px; + bottom: 30px; +} diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 307126e..ca68c85 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -97,12 +97,8 @@ trigger: 'blur', message: '请输入验证码', validator: (rule, value, callback) => { - if (this.loginForm.username === 'admin') { - callback() - return - } if (value.length !== 4) { - callback(new Error('密码输入错误')) + callback(new Error('验证码输入错误')) } else { callback() } @@ -137,16 +133,11 @@ async sendSms () { if (this.isVer) return; - if (this.loginForm.username && this.loginForm.password) { + if (this.loginForm.username) { this.msgLoading = true; try { - const { access_token } = (await login(this.loginForm)) - const { mobile } = (await getInfo(access_token)) - this.temp.mobile = mobile; - this.temp.token = access_token; await sendSms({ - mobile, - token: access_token + username: this.loginForm.username }) this.isVer = true; this.verTime = 60; @@ -167,7 +158,7 @@ } } else { this.$message({ - message: '请输入登录名和密码', + message: '请输入登录名', type: 'warning' }) } @@ -187,13 +178,7 @@ async handleLogin() { this.$refs.loginForm.validate(async(valid) => { if (valid) { - if (this.loginForm.username !== 'admin') { - await checkSms({ - mobile: this.temp.mobile, - token: this.temp.token, - code: this.loginForm.code - }) - } + this.loading = true this.$store.dispatch('user/login', this.loginForm).then(() => {