Commit 31d370b0 authored by 李玲燕's avatar 李玲燕

增加云端跳转自动登录、修改CMake打包配置

parent f9e8357e
...@@ -8,7 +8,7 @@ set (CMAKE_CXX_STANDARD 11) ...@@ -8,7 +8,7 @@ set (CMAKE_CXX_STANDARD 11)
# Version. # Version.
set (MAJOR_VERSION "1") set (MAJOR_VERSION "1")
set (MINOR_VERSION "2") set (MINOR_VERSION "2")
set (PATCH_VERSION "3") set (PATCH_VERSION "4")
# Import cmake modules. # Import cmake modules.
list (APPEND CMAKE_MODULE_PATH "$ENV{HT_BUILDSYS_CMAKE_MODULES}") list (APPEND CMAKE_MODULE_PATH "$ENV{HT_BUILDSYS_CMAKE_MODULES}")
...@@ -43,4 +43,8 @@ set (CPACK_PACKAGE_VERSION_PATCH "${PATCH_VERSION}") ...@@ -43,4 +43,8 @@ set (CPACK_PACKAGE_VERSION_PATCH "${PATCH_VERSION}")
set (CPACK_PACKAGE_CONTACT "Li Lingyan <lingyan.li@waytous.com>, Gao Xiaofan <xiaofan.gao@waytous.com>") set (CPACK_PACKAGE_CONTACT "Li Lingyan <lingyan.li@waytous.com>, Gao Xiaofan <xiaofan.gao@waytous.com>")
set (CPACK_DEBIAN_PACKAGE_DESCRIPTION "webtruckview. Branch: ${GIT_BRANCH}. Commit: ${GIT_LAST_COMMIT}.") set (CPACK_DEBIAN_PACKAGE_DESCRIPTION "webtruckview. Branch: ${GIT_BRANCH}. Commit: ${GIT_LAST_COMMIT}.")
# 运维配置路径
add_deb_conffiles (
FILES "/var/www/${PROJECT_NAME}/dist/config.json"
)
include(HtCMakeDeb) include(HtCMakeDeb)
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</template> </template>
<script setup> <script setup>
import { reactive, ref, watch, getCurrentInstance } from 'vue'; import { reactive, ref, watch, getCurrentInstance, onBeforeMount } from 'vue';
import { storeToRefs } from 'pinia' import { storeToRefs } from 'pinia'
import { Message } from 'view-ui-plus'; import { Message } from 'view-ui-plus';
import { useStateStore } from '@/store/StateStore.js' import { useStateStore } from '@/store/StateStore.js'
...@@ -54,6 +54,17 @@ ...@@ -54,6 +54,17 @@
password: '' password: ''
}) })
onBeforeMount(() => {
let url = decodeURI(window.location.href)
console.log(url)
let [, remote] = url.split('?obj=')
if (remote && remote == 'web_view') {
formItem.number = 'admin'
formItem.password = 'admin'
handleSubmit()
}
})
function handleSubmit() { function handleSubmit() {
if (isShowLoading.value) return if (isShowLoading.value) return
if (truckMonitorStatus.value) return Message.error('车端未启动,无法登录!') if (truckMonitorStatus.value) return Message.error('车端未启动,无法登录!')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment