From bb0d7ffabc5306cc30002bd825f5f0885d2fe34c Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Mon, 20 Mar 2023 17:16:15 +0800
Subject: [PATCH] 视频下拉框样式
---
src/styles/media/index.scss | 8 ++++++++
vue.config.js | 2 +-
src/components/map/index.vue | 14 +++++++++-----
src/views/activity/index.vue | 2 +-
4 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index e7e7a6f..05df83e 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -580,7 +580,7 @@
this.removeMxTileset(`sdTilesetLayer${item}`, this.housingIndent)
})
- // this.addMxTileset('sdTilesetLayer', `${tile3DUrl}/sf3d/361102/model/wanda/tileset.json`, this.housingIndent)
+ this.addMxTileset('sdTilesetLayer', `${tile3DUrl}/sf3d/361102/model/wanda/tileset.json`, this.housingIndent)
if (this.tilesetLayerType == type) {
this.tilesetLayerType = ''
@@ -805,7 +805,8 @@
let alt = params.alt || 2
if (type == "billboard") {
- pointElement = new global.DC.Billboard(new global.DC.Position(Number(params.lng), Number(params.lat), Number(alt)), params.url)
+ // pointElement = new global.DC.Billboard(new global.DC.Position(Number(params.lng), Number(params.lat), Number(alt)), params.url)
+ pointElement = new global.DC.Billboard(new global.DC.Position(Number(params.lng), Number(params.lat), 2), params.url)
// pointElement.setStyle({
// disableDepthTestDistance: 0
// })
@@ -816,7 +817,8 @@
pointElement.on(global.DC.MouseEventType.MOUSE_OVER, mouseOverIncident)
pointElement.on(global.DC.MouseEventType.MOUSE_OUT, mouseOutIncident)
} else if (type == "label") {
- labelElement = new global.DC.Label(new global.DC.Position(Number(params.lng), Number(params.lat), Number(alt)), params.text)
+ // labelElement = new global.DC.Label(new global.DC.Position(Number(params.lng), Number(params.lat), Number(alt)), params.text)
+ labelElement = new global.DC.Label(new global.DC.Position(Number(params.lng), Number(params.lat), 2), params.text)
labelElement.setStyle({
fillColor: global.DC.Color.CRIMSON,
style: global.DC.Namespace.Cesium.LabelStyle.FILL_AND_OUTLINE,
@@ -832,13 +834,15 @@
layersObjcect[layerName].addOverlay(labelElement)
labelElement.on(global.DC.MouseEventType.CLICK, incident)
} else if (type == "billboardOrLabel") {
- pointElement = new global.DC.Billboard(new global.DC.Position(Number(params.lng), Number(params.lat), Number(alt)), params.url)
+ // pointElement = new global.DC.Billboard(new global.DC.Position(Number(params.lng), Number(params.lat), Number(alt)), params.url)
+ pointElement = new global.DC.Billboard(new global.DC.Position(Number(params.lng), Number(params.lat), 2), params.url)
pointElement.size = [32, 32]
pointElement.attrParams = params
layersObjcect[layerName].addOverlay(pointElement)
pointElement.on(global.DC.MouseEventType.CLICK, incident)
- labelElement = new global.DC.Label(new global.DC.Position(Number(params.lng), Number(params.lat), Number(alt)), params.text)
+ // labelElement = new global.DC.Label(new global.DC.Position(Number(params.lng), Number(params.lat), Number(alt)), params.text)
+ labelElement = new global.DC.Label(new global.DC.Position(Number(params.lng), Number(params.lat), 2), params.text)
labelElement.setStyle({
fillColor: global.DC.Color.CRIMSON,
style: global.DC.Namespace.Cesium.LabelStyle.FILL_AND_OUTLINE,
diff --git a/src/styles/media/index.scss b/src/styles/media/index.scss
index 40c0cb9..ed78598 100644
--- a/src/styles/media/index.scss
+++ b/src/styles/media/index.scss
@@ -1426,6 +1426,8 @@
padding-left: countSizeVw(10, 1920);
}
+
+
.el-select .el-input .el-select__caret {
font-size: countSizeVh(14);
line-height: countSizeVh(32);
@@ -1745,6 +1747,12 @@
}
}
}
+
+ .select {
+ .el-input--suffix .el-input__inner {
+ padding-right: countSizeVw(40, 1920) !important;
+ }
+ }
}
.main-content {
diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue
index 49b92fc..3b998f7 100644
--- a/src/views/activity/index.vue
+++ b/src/views/activity/index.vue
@@ -688,7 +688,7 @@
// 警员警车列表根据活动deptid筛选
// 获取树状警员数据
- console.log('item',item.deptId);
+ console.log('item',item.deptId,item);
this.getPolicemanTree({deptId:item.deptId})
this.getCarList({deptId:item.deptId})
diff --git a/vue.config.js b/vue.config.js
index 6999dd9..7ff01b6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -158,7 +158,7 @@
"/api": {
// target用于配置你允许访问数据的计算机名称，即是你的api接口的服务器地址
// target: "http://localhost:82",
- target: "http://192.168.0.200:82",
+ target: "http://192.168.0.126:82",
// target: "http://17.20.10.3:82",
// target: "http://10.141.11.11:8081/api",
// ws: true, //启用webSocket6566
--
Gitblit v1.9.3