fix:登录页调试,大屏事件打点修改,地图控制器位置调整

This commit is contained in:
SunTao 2024-11-05 11:22:23 +08:00
parent 34a57ae920
commit 8d0c115a51
7 changed files with 30 additions and 19 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com * @Author: SunTao 328867980@qq.com
* @Date: 2024-10-14 10:46:23 * @Date: 2024-10-14 10:46:23
* @LastEditors: SunTao 328867980@qq.com * @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2024-10-31 17:35:26 * @LastEditTime: 2024-11-05 10:46:24
* @FilePath: \znxjxt-ui\src\views\xj\inspection\task-management\components\fssm-map.vue * @FilePath: \znxjxt-ui\src\views\xj\inspection\task-management\components\fssm-map.vue
* @Description: 公共地图 * @Description: 公共地图
--> -->
@ -10,7 +10,7 @@
<template> <template>
<div class="map-container"> <div class="map-container">
<div ref="container" :id="`map-${mapId}`"></div> <div ref="container" :id="`map-${mapId}`"></div>
<div ref="mapController" class="control-container"> <div ref="mapController" :style="controlStyle" class="control-container">
<!-- 绘制图形 --> <!-- 绘制图形 -->
<div class="draw-map" v-if="showDraw"> <div class="draw-map" v-if="showDraw">
<i class="el-icon-edit" @click="drawMap()"></i> <i class="el-icon-edit" @click="drawMap()"></i>
@ -87,6 +87,11 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
//
controlStyle: {
type: Object,
default: () => {},
},
// id // id
mapId: { mapId: {
type: String, type: String,
@ -555,8 +560,8 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
position: absolute; position: absolute;
left: 1rem; // left: 1rem;
top: 1rem; // top: 1rem;
.draw-map { .draw-map {
width: 1.5rem; width: 1.5rem;

View File

@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com * @Author: SunTao 328867980@qq.com
* @Date: 2024-10-17 11:34:00 * @Date: 2024-10-17 11:34:00
* @LastEditors: SunTao 328867980@qq.com * @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2024-11-01 13:02:35 * @LastEditTime: 2024-11-05 10:23:53
* @FilePath: \znxjxt-ui\src\views\big-screen\index.vue * @FilePath: \znxjxt-ui\src\views\big-screen\index.vue
* @Description: 大屏首页 * @Description: 大屏首页
--> -->
@ -128,6 +128,8 @@
<fssm-map <fssm-map
v-if="!showImgBk" v-if="!showImgBk"
ref="roadMap" ref="roadMap"
:showChange="true"
:controlStyle="{ top: '30%', right: '26%' }"
@map-moveend="mapMoveend" @map-moveend="mapMoveend"
@map-zoom="getZoom" @map-zoom="getZoom"
@feature-select="featureSelect" @feature-select="featureSelect"

View File

@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com * @Author: SunTao 328867980@qq.com
* @Date: 2024-10-08 09:26:24 * @Date: 2024-10-08 09:26:24
* @LastEditors: SunTao 328867980@qq.com * @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2024-10-28 14:19:03 * @LastEditTime: 2024-11-05 11:15:48
* @FilePath: \znxjxt-ui\src\views\login.vue * @FilePath: \znxjxt-ui\src\views\login.vue
* @Description: 系统登录页 * @Description: 系统登录页
--> -->
@ -10,7 +10,7 @@
<template> <template>
<div class="login"> <div class="login">
<div class="login-title"> <div class="login-title">
<div class="mini-title">辽宁交投</div> <div class="mini-title"></div>
<div class="middle-title"> <div class="middle-title">
<div>智能巡检系统</div> <div>智能巡检系统</div>
<div><span>安全生产</span><span>可视化便捷</span></div> <div><span>安全生产</span><span>可视化便捷</span></div>
@ -205,33 +205,36 @@ export default {
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
height: 100%; height: 100%;
padding: 0 10%; background-image: url("../assets/images/login-bkg.png");
background-image: url("../assets/images/login-background.jpg");
background-size: cover; background-size: cover;
.login-title { .login-title {
width: 14.5%; width: 350px;
height: 40%; height: 350px;
padding: 3% 0;
.mini-title{ .mini-title {
width: 100%; width: 100%;
height: 20%; height: 15%;
font-weight: 600;
background-image: url("../assets/images/login-title.png");
background-repeat: no-repeat;
background-size: 30% 55%;
}
.middle-title {
width: 100%;
color:#4F5B6B;
> div:nth-child(1) {
font-size: 3rem;
font-weight: 600; font-weight: 600;
} }
.middle-title{ > div:nth-child(2) {
width: 100%;
>div:nth-child(1){
font-size: 2rem;
font-weight: 600;
}
>div:nth-child(2){
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
font-size: 1.1rem; padding-right: 15%;
font-size: 1.5rem;
font-weight: 600; font-weight: 600;
} }
} }

View File

@ -319,6 +319,7 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-copy-document" icon="el-icon-copy-document"
v-if="scope.row.id !== scope.row.snapshotId"
@click="splitDefect(scope.row)" @click="splitDefect(scope.row)"
>拆分 >拆分
</el-button> </el-button>