From c658f316d2f464e510d10f1081c52848c3aefeb2 Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期三, 15 十一月 2023 23:21:16 +0800
Subject: [PATCH] 企业 视频弹框
---
src/utils/request.js | 1
src/components/right/right-bottom.vue | 20 ----------
src/components/map/viewer1.vue | 37 +++++++++++-------
static/CimSDK/Workers/path/Path.html | 3 +
src/assets/App.css | 16 ++++++--
src/components/left/leftmenu.vue | 1
static/conf.js | 1
src/components/right/right-top.vue | 8 ++--
8 files changed, 40 insertions(+), 47 deletions(-)
diff --git a/src/assets/App.css b/src/assets/App.css
index 303c052..ff9ecc0 100644
--- a/src/assets/App.css
+++ b/src/assets/App.css
@@ -15,16 +15,20 @@
#sdkContainer {
background-size: 100%;
}
+
.tipStyle {
color: white;
background-color: rgba(0, 0, 0, 0.4) !important;
}
+
.tipStyle .el-notification__title {
color: white;
}
+
.tipStyle .el-notification__content {
color: white;
}
+
.cesium-viewer-animationContainer,
.cesium-viewer-timelineContainer {
display: none;
@@ -39,6 +43,7 @@
.cesium-viewer-bottom {
display: none;
}
+
.cesium-viewer-toolbar,
.cesium-viewer-fullscreenContainer {
display: none !important;
@@ -63,13 +68,15 @@
.other-class .layui-layer-title {
/* background-color: white !important;
color : black !important; */
- background-color: rgba(0, 0, 0, 0.3) !important;
+ /* background-color: rgba(0, 0, 0, 0.3) !important; */
+ background: #0048fd69 !important;
color: white;
}
.other-class {
border: 1px solid white !important;
}
+
.layui-layer-setwin .layui-layer-close1 {
background-position: -156px -38px !important;
}
@@ -272,12 +279,13 @@
height: unset !important;
background-color: unset !important;
}
+
.user_menu .el-menu {
background-color: rgba(0, 0, 0, 0.4) !important;
- margin-top: 0px!important;
- border-radius: 8px!important;
+ margin-top: 0px !important;
+ border-radius: 8px !important;
}
.user_menu /deep/ .el-menu-item:hover {
background-color: unset !important;
-}
+}
\ No newline at end of file
diff --git a/src/components/left/leftmenu.vue b/src/components/left/leftmenu.vue
index c906f5a..3d1ffed 100644
--- a/src/components/left/leftmenu.vue
+++ b/src/components/left/leftmenu.vue
@@ -3133,7 +3133,6 @@
.el-tree .TreeNodeClass {
width: 100%;
- background-color: #bfa;
flex: 1;
display: flex;
align-items: center;
diff --git a/src/components/map/viewer1.vue b/src/components/map/viewer1.vue
index 109f06b..93f7d55 100644
--- a/src/components/map/viewer1.vue
+++ b/src/components/map/viewer1.vue
@@ -81,7 +81,7 @@
title="浼佷笟淇℃伅"
append-to-body
width="50%"
- height="55%"
+ height="60%"
style="overflow: auto"
:visible.sync="QYbox"
:before-close="dialogClose"
@@ -89,7 +89,7 @@
<div class="el-dialog-div">
<div class="inquire">
<el-form
- size="medium"
+ size="mini"
ref="queryForm"
:model="queryForm"
:inline="true"
@@ -117,33 +117,36 @@
highlight-current-row
height="50"
>
- <el-table-column type="index" width="50"></el-table-column>
+ <el-table-column type="index" width="40"></el-table-column>
<el-table-column
property="浼佷笟鍚嶇О"
label="浼佷笟鍚嶇О"
+ min-width="240"
></el-table-column>
- <!-- <el-table-column
+ <el-table-column
property="浼佷笟绫诲瀷"
label="浼佷笟绫诲瀷"
+ min-width="240"
></el-table-column>
<el-table-column
property="鎴愮珛鏃堕棿"
label="鎴愮珛鏃堕棿"
+ width="120"
></el-table-column>
- <el-table-column
+ <!-- <el-table-column
property="鎵�灞炶涓�"
label="鎵�灞炶涓�"
- ></el-table-column>
+ ></el-table-column> -->
<el-table-column
property="娉曚汉"
label="娉曚汉"
- width="100"
- ></el-table-column> -->
- <el-table-column
+ width="80"
+ ></el-table-column>
+ <!-- <el-table-column
property="娉ㄥ唽鍦板潃"
label="娉ㄥ唽鍦板潃"
- ></el-table-column>
- <el-table-column label="鎿嶄綔" width="100">
+ ></el-table-column> -->
+ <el-table-column label="鎿嶄綔" width="80">
<template slot-scope="scope">
<el-button
@click="handleClick(scope.row)"
@@ -157,7 +160,7 @@
<div
slot="footer"
class="dialog-footer"
- style="text-align: center; margin-top: 5px"
+ style="text-align: center; margin-top: 2px"
>
<el-pagination
@size-change="handleSizeChange"
@@ -1263,11 +1266,11 @@
.aboutDialog >>> .el-dialog__body {
height: 77%;
padding: 0px !important;
- padding: 15px !important;
+ padding: 10px 10px 8px !important;
}
.aboutDialog >>> .el-dialog__header {
- padding: 10px 20px;
+ padding: 10px 20px 0;
height: 25px;
line-height: 25px;
font-weight: bold;
@@ -1298,6 +1301,7 @@
.el-form >>> .el-form-item__label {
color: #fff;
+ margin-left: 10px;
}
.aboutDialog .el-dialog-div {
@@ -1326,8 +1330,11 @@
width: 383px;
}
-.el-table /deep/ th {
+.el-table /deep/ th,
+.el-table /deep/ td {
background-color: transparent;
+ padding-top: 4px;
+ padding-bottom: 4px;
}
.el-table /deep/ tr {
diff --git a/src/components/right/right-bottom.vue b/src/components/right/right-bottom.vue
index a11df08..41bd8c1 100644
--- a/src/components/right/right-bottom.vue
+++ b/src/components/right/right-bottom.vue
@@ -351,27 +351,7 @@
Bus.$off("closeLegendPop");
},
methods: {
- qingqiu() {
- $.ajax({
- url: "http://10.117.5.21/artemis/api/resource/v1/cameras/indexCode",
- type: "POST",
- dataType: "json",
- data: {
- cameraIndexCode: "57533537f16d4cb9a151cf1527b16798",
- },
- contentType: "application/json",
- headers: {
- "x-ca-key": 20380928,
- "x-ca-signature-headers": "x-ca-key",
- "x-ca-signature": "IVKr1h18tQGUyxsarkSJCyjO2b0BrBQghc5Bga3V3O8=",
- },
- success: function (result) {
- console.log(result);
- },
- });
- },
// 鐩告満鍙傛暟
-
getcamera() {
let p = sgworld.Navigate.getCameraInfo();
console.log(p);
diff --git a/src/components/right/right-top.vue b/src/components/right/right-top.vue
index 8d0021b..1fcc4a1 100644
--- a/src/components/right/right-top.vue
+++ b/src/components/right/right-top.vue
@@ -1570,10 +1570,10 @@
// this.showInfoBox = true;
if (this.info["JK鍐呯爜"]) {
- this.$message({
- showClose: true,
- message: "杩炴帴鐘舵�佹煡璇腑",
- });
+ // this.$message({
+ // showClose: true,
+ // message: "杩炴帴鐘舵�佹煡璇腑",
+ // });
this.spjkLoad(this.info);
}
},
diff --git a/src/utils/request.js b/src/utils/request.js
index 5e8262b..1123155 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,7 +4,6 @@
// create an axios instance
const service = axios.create({
- // baseURL: 'http://10.10.4.116:12316/server/', // api鐨刡ase_url
baseURL: 'http://10.10.4.116:8089/', // api鐨刡ase_url
timeout: 35000, // 璇锋眰瓒呮椂鏃堕棿
headers: {
diff --git a/static/CimSDK/Workers/path/Path.html b/static/CimSDK/Workers/path/Path.html
index f3a2097..fdf7682 100644
--- a/static/CimSDK/Workers/path/Path.html
+++ b/static/CimSDK/Workers/path/Path.html
@@ -11,7 +11,8 @@
html,
body,
.layui-prop {
- background-color: rgba(0, 0, 0, 0);
+ /* background-color: rgba(0, 0, 0, 0); */
+ background:#104ce433 !important;;
height: 100%;
color: #fff;
overflow-y: auto;
diff --git a/static/conf.js b/static/conf.js
index 25edcc8..66ba422 100644
--- a/static/conf.js
+++ b/static/conf.js
@@ -1,4 +1,3 @@
-//window.GIS_IP = 'http://183.162.245.49:18073'
window.GIS_IP = 'http://10.10.4.116:8070'
window.KEYPOIS = [{
--
Gitblit v1.9.3