diff --git a/epmet-oper-web/.env.development b/epmet-oper-web/.env.development index 1dcd7c9..bc8d0ec 100644 --- a/epmet-oper-web/.env.development +++ b/epmet-oper-web/.env.development @@ -1,7 +1,7 @@ NODE_ENV=development # VUE_APP_API_SERVER = http://118.190.150.119:41080/api -VUE_APP_API_SERVER = http://localhost:8080/api -# VUE_APP_API_SERVER = http://192.168.1.144/api +# VUE_APP_API_SERVER = http://localhost:8080/api +VUE_APP_API_SERVER = http://192.168.1.144/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api VUE_APP_NODE_ENV=dev diff --git a/epmet-oper-web/.env.production.sit.project b/epmet-oper-web/.env.production.sit.project new file mode 100644 index 0000000..582619c --- /dev/null +++ b/epmet-oper-web/.env.production.sit.project @@ -0,0 +1,5 @@ +NODE_ENV=production +VUE_APP_API_SERVER = http://192.168.1.140/api +# VUE_APP_API_SERVER = http://192.168.1.140/api +VUE_APP_NODE_ENV=prod:sit-project +VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/epmet-oper-web/.vscode/settings.json b/epmet-oper-web/.vscode/settings.json index 2eab4ad..a51fff7 100644 --- a/epmet-oper-web/.vscode/settings.json +++ b/epmet-oper-web/.vscode/settings.json @@ -31,7 +31,7 @@ } }, "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, "git.enableSmartCommit": true } diff --git a/epmet-oper-web/src/components/ren-process-detail/src/ren-process-detail.vue b/epmet-oper-web/src/components/ren-process-detail/src/ren-process-detail.vue index 5eef7df..2e80d90 100644 --- a/epmet-oper-web/src/components/ren-process-detail/src/ren-process-detail.vue +++ b/epmet-oper-web/src/components/ren-process-detail/src/ren-process-detail.vue @@ -4,39 +4,34 @@

{{ $t('process.circulation') }}

- - - - - - - + + + + + + + -
diff --git a/epmet-oper-web/src/views/pages/login.vue b/epmet-oper-web/src/views/pages/login.vue index aad890b..cd376f6 100644 --- a/epmet-oper-web/src/views/pages/login.vue +++ b/epmet-oper-web/src/views/pages/login.vue @@ -7,13 +7,8 @@

{{ $t('login.title') }}

- +

@@ -100,7 +80,7 @@ import debounce from 'lodash/debounce' import { messages } from '@/i18n' import { getUUID, encryptedData } from '@/utils' export default { - data() { + data () { return { i18nMessages: messages, captchaPath: '', @@ -117,7 +97,7 @@ export default { } }, computed: { - dataRule() { + dataRule () { return { phone: [{ required: true, message: '手机号不能为空', trigger: 'blur' }], password: [ @@ -129,7 +109,7 @@ export default { } } }, - created() { + created () { this.getCaptcha() //获取公钥 @@ -137,13 +117,13 @@ export default { }, methods: { // 获取验证码 - getCaptcha() { + getCaptcha () { this.dataForm.uuid = getUUID() this.captchaPath = `${window.SITE_CONFIG['apiURL']}/auth/login/captcha?uuid=${this.dataForm.uuid}` }, // 获取公钥 - getPubKey() { + getPubKey () { this.$http .post('/auth/govweb/getKey') .then(({ data: res }) => { @@ -153,7 +133,7 @@ export default { this.pubKey = res.data // 获取到公钥; }) - .catch(() => {}) + .catch(() => { }) }, // 表单提交 @@ -177,11 +157,11 @@ export default { return this.$message.error(res.msg) } localStorage.setItem('userType', 'oper') - localStorage.setItem('token', res.data.token) - Cookies.set('token', res.data.token) - this.$router.replace({ name: 'home' }).catch(() => {}) + localStorage.setItem('oper_token', res.data.token) + Cookies.set('oper_token', res.data.token) + this.$router.replace({ name: 'home' }).catch(() => { }) }) - .catch(() => {}) + .catch(() => { }) }) }, 1000,