样式等问题优化调试
This commit is contained in:
parent
c1fd9bf53c
commit
0873183968
|
|
@ -1,9 +1,9 @@
|
|||
VITE_APP_name = 机器人 - 大屏
|
||||
VITE_APP_content = 机器人
|
||||
# 请求的base api
|
||||
VITE_APP_baseApiURL = /sbdRobot
|
||||
VITE_APP_robotBaseApiURL = http://sgwpdm.ah.sgcc.com.cn/iws/sbdRobot
|
||||
VITE_APP_baseApiURL = /iws/sbdRobot
|
||||
VITE_APP_robotBaseApiURL = http://112.31.70.193:1854/icvs2/
|
||||
# 路由的base api
|
||||
VITE_APP_routeBasePath = /bnsRobot
|
||||
VITE_APP_biuldBase = /robot-screen-ui
|
||||
VITE_APP_routeBasePath = /rebotWeb
|
||||
VITE_APP_biuldBase = ./
|
||||
VITE_APP_imgPreviewUrl = http://sgwpdm.ah.sgcc.com.cn/iws/minioFile/robot
|
||||
|
|
@ -11,7 +11,7 @@ import StorageS from 'storages-js'
|
|||
const allStorage = {}
|
||||
function createS(key, value) {
|
||||
if (!allStorage[key]) {
|
||||
allStorage[key] = new StorageS(key, value, { modelName: 'local' })
|
||||
allStorage[key] = new StorageS(key, value, { modelName: 'session' })
|
||||
}
|
||||
return allStorage[key]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,8 @@ service.interceptors.request.use(
|
|||
// config.headers['token'] = userData.userInfo.token
|
||||
|
||||
if (userData?.userInfo?.token) {
|
||||
config.headers['Authorization'] = 'Bearer ' + userData?.userInfo?.token
|
||||
// config.headers['Authorization'] = 'Bearer ' + userData?.userInfo?.token
|
||||
config.headers['Token'] = userData?.userInfo?.token
|
||||
} else {
|
||||
config.headers['Token'] = 'test'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@ service.interceptors.request.use(
|
|||
config.headers = config.headers || {}
|
||||
// config.headers['token'] = userData.userInfo.token
|
||||
|
||||
if (userData?.userInfo?.token) {
|
||||
config.headers['Authorization'] = 'Bearer ' + userData?.userInfo?.token
|
||||
} else {
|
||||
config.headers['Token'] = 'test'
|
||||
}
|
||||
// if (userData?.userInfo?.token) {
|
||||
// config.headers['Authorization'] = 'Bearer ' + userData?.userInfo?.token
|
||||
// } else {
|
||||
// config.headers['Token'] = 'test'
|
||||
// }
|
||||
return config
|
||||
},
|
||||
() => {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* 路由列表部分
|
||||
* 所有路由必须先手动写好,然后由后端菜单接口来进行匹配并且指定是否显示
|
||||
*/
|
||||
import { createWebHistory, createRouter } from 'vue-router'
|
||||
import { createWebHistory, createWebHashHistory, createRouter } from 'vue-router'
|
||||
/**
|
||||
* 为路由配置meta相当于为该路由配置了基本信息,配置的属性如下
|
||||
* title 用作标签显示字样的字段
|
||||
|
|
@ -181,8 +181,8 @@ export const constantRoutes = [
|
|||
]
|
||||
|
||||
const router = createRouter({
|
||||
history: createWebHistory(import.meta.env.VITE_APP_routeBasePath),
|
||||
// history: createWebHistory(),
|
||||
// history: createWebHistory(import.meta.env.VITE_APP_routeBasePath),
|
||||
history: createWebHashHistory(),
|
||||
routes: constantRoutes,
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -290,7 +290,7 @@ onMounted(() => {
|
|||
nextTick(() => {
|
||||
const container = marqueeContainer.value
|
||||
imgWidth.value = (container.clientWidth - 40) / 4
|
||||
imgHeight.value = `${container.clientHeight * 0.68}`
|
||||
imgHeight.value = `${container.clientHeight * 0.78}`
|
||||
})
|
||||
})
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -2,10 +2,10 @@
|
|||
<DialogModal
|
||||
@onHandleCloseModal="onHandleCloseAddModal"
|
||||
:modalTitle="`${markerParams.type}预置点位`"
|
||||
:width="`120vh`"
|
||||
:height="`90vh`"
|
||||
:width="`140vh`"
|
||||
:height="`110vh`"
|
||||
>
|
||||
<div style="display: flex; flex-direction: column; height: 100%">
|
||||
<div class="add-or-edit-marker-form">
|
||||
<n-form
|
||||
ref="addOrEditFormRef"
|
||||
size="small"
|
||||
|
|
@ -117,7 +117,7 @@
|
|||
</n-grid>
|
||||
</n-form>
|
||||
|
||||
<n-flex justify="space-between" style="flex: 1; margin-top: 10px">
|
||||
<n-flex justify="space-between" style="flex: 1; margin-top: 6px">
|
||||
<div class="left-box" style="width: 49%">
|
||||
<!-- 放置video -->
|
||||
<FlvPlayer :cameraNode="cameraNode" :videoId="`video-3`" />
|
||||
|
|
@ -393,3 +393,28 @@ onBeforeUnmount(() => {
|
|||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.add-or-edit-marker-form {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
overflow: auto;
|
||||
// 滚动条样式
|
||||
// 优化一下滚动条
|
||||
&::-webkit-scrollbar {
|
||||
width: 6px;
|
||||
}
|
||||
&::-webkit-scrollbar-thumb {
|
||||
background-color: #6e90a9;
|
||||
}
|
||||
|
||||
// 优化滚动条
|
||||
&::-webkit-scrollbar {
|
||||
width: 6px;
|
||||
}
|
||||
&::-webkit-scrollbar-thumb {
|
||||
background-color: #6e90a9;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -248,42 +248,42 @@ onMounted(async () => {})
|
|||
}
|
||||
.row-3-item-1,
|
||||
.row-3-item-3 {
|
||||
width: 100px;
|
||||
height: 100px;
|
||||
margin: 42px auto 0;
|
||||
width: 68px;
|
||||
height: 68px;
|
||||
margin: 20px auto 0;
|
||||
position: relative;
|
||||
background: url('@/assets/home-imgs/control-2-round.png') no-repeat center center;
|
||||
background-size: 100% 100%;
|
||||
|
||||
> img {
|
||||
width: 24px;
|
||||
height: 26px;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
cursor: pointer;
|
||||
object-fit: contain;
|
||||
}
|
||||
|
||||
.arrow-top {
|
||||
position: absolute;
|
||||
top: 6px;
|
||||
top: 1px;
|
||||
left: 50%;
|
||||
transform: translateX(-50%) rotate(-90deg);
|
||||
}
|
||||
.arrow-right {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
right: 8px;
|
||||
right: 1px;
|
||||
transform: translateY(-50%);
|
||||
}
|
||||
.arrow-bottom {
|
||||
position: absolute;
|
||||
bottom: 6px;
|
||||
bottom: 1px;
|
||||
left: 50%;
|
||||
transform: translateX(-50%) rotate(90deg);
|
||||
}
|
||||
.arrow-left {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 8px;
|
||||
left: 1px;
|
||||
transform: translateY(-50%) rotate(-180deg);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@
|
|||
:scroll-x="10"
|
||||
flex-height
|
||||
:columns="tableColumns_1"
|
||||
:style="{ height: `70%` }"
|
||||
:style="{ height: `50%` }"
|
||||
v-if="activeIndex === 0"
|
||||
/>
|
||||
|
||||
|
|
@ -220,11 +220,11 @@
|
|||
:scroll-x="10"
|
||||
:data="tableData_2"
|
||||
:columns="tableColumns_2"
|
||||
:style="{ height: `70%` }"
|
||||
:style="{ height: `50%` }"
|
||||
v-if="activeIndex === 1"
|
||||
/>
|
||||
|
||||
<div style="margin-top: 10px; display: flex; justify-content: flex-end">
|
||||
<div style="margin-top: 4px; display: flex; justify-content: flex-end">
|
||||
<n-pagination
|
||||
show-size-picker
|
||||
v-if="activeIndex === 0"
|
||||
|
|
@ -237,7 +237,7 @@
|
|||
/>
|
||||
</div>
|
||||
|
||||
<div style="margin-top: 10px; display: flex; justify-content: flex-end">
|
||||
<div style="margin-top: 4px; display: flex; justify-content: flex-end">
|
||||
<n-pagination
|
||||
show-size-picker
|
||||
v-if="activeIndex === 1"
|
||||
|
|
@ -456,7 +456,7 @@ const onHandleBatchSend = async () => {
|
|||
message.success('下发成功')
|
||||
getProjectPersonList()
|
||||
} else {
|
||||
message.error(res.message)
|
||||
message.error(res.msg)
|
||||
}
|
||||
}
|
||||
const onHandlePartSend = async () => {
|
||||
|
|
@ -1053,7 +1053,7 @@ onUpdated(() => {
|
|||
|
||||
.more-panel-card {
|
||||
width: 80%;
|
||||
height: 90vh;
|
||||
height: 120vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background: url('@/assets/home-imgs/modal-bg.png') no-repeat center center;
|
||||
|
|
@ -1107,15 +1107,15 @@ onUpdated(() => {
|
|||
|
||||
.tabs-btns {
|
||||
display: flex;
|
||||
margin: 8px 0;
|
||||
margin: 6px 0;
|
||||
|
||||
.tabs-btn {
|
||||
width: 100px;
|
||||
height: 42px;
|
||||
width: 90px;
|
||||
height: 32px;
|
||||
background-color: #1b4589;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
line-height: 42px;
|
||||
line-height: 32px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -89,10 +89,10 @@ const activeIndex = ref(0)
|
|||
const currentComponent = ref('comp-a')
|
||||
|
||||
const compareList = ref([
|
||||
{ title: '巡检次数', total: 58, amount: 26, unit: '次' },
|
||||
{ title: '巡检照片', total: 100, amount: 100, unit: '张' },
|
||||
{ title: '比对次数', total: 100, amount: 100, unit: '次' },
|
||||
{ title: '异常数量', total: 100, amount: 100, unit: '项' },
|
||||
{ title: '巡检次数', total: 0, amount: 0, unit: '次' },
|
||||
{ title: '巡检照片', total: 0, amount: 0, unit: '张' },
|
||||
{ title: '比对次数', total: 0, amount: 0, unit: '次' },
|
||||
{ title: '异常数量', total: 0, amount: 0, unit: '项' },
|
||||
])
|
||||
const componentMap = {
|
||||
'comp-a': TapsOne,
|
||||
|
|
@ -247,7 +247,7 @@ const onHandleTabs = (component, index) => {
|
|||
|
||||
.more-panel-card {
|
||||
width: 80%;
|
||||
height: 80vh;
|
||||
height: 120vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background: url('@/assets/home-imgs/modal-bg.png') no-repeat center center;
|
||||
|
|
@ -265,12 +265,12 @@ const onHandleTabs = (component, index) => {
|
|||
margin: 20px 0;
|
||||
|
||||
.tabs-btn {
|
||||
width: 100px;
|
||||
height: 42px;
|
||||
width: 90px;
|
||||
height: 32px;
|
||||
background-color: #1b4589;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
line-height: 42px;
|
||||
line-height: 32px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ const queryParams = ref({
|
|||
onMounted(() => {
|
||||
const tableContainer = tableContainerRef.value
|
||||
if (tableContainer) {
|
||||
imageHeight.value = ((tableContainer.clientHeight - 10) / 2) * 0.68
|
||||
imageHeight.value = ((tableContainer.clientHeight - 10) / 2) * 0.78
|
||||
imageWidth.value = (tableContainer.clientWidth - 30) / 4
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
</div>
|
||||
|
||||
<div class="robot-7" v-if="fullScreenVisibleNew">
|
||||
<ControlDeck />
|
||||
<ControlDeckNew />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -89,6 +89,7 @@ import CenterTwo from './components/center-two.vue' // 中二
|
|||
import RightOne from './components/right-one.vue' // 右一
|
||||
import RightTwo from './components/right-two/index.vue' // 右二
|
||||
import ControlDeck from './components/control-deck.vue' // 控制台
|
||||
import ControlDeckNew from './components/control-deck-new.vue' // 控制台
|
||||
import { decrypt, encrypt } from '@/utils/encrypt'
|
||||
|
||||
import { getRobotTokenFn, getRobotDeviceListFn } from '@/utils/getRobotInfo' // 获取机器人信息
|
||||
|
|
|
|||
Loading…
Reference in New Issue