Skip to content

乳
乳山瑞博-大屏
Commit 8519ef67 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

3d背景图test

parent 7f2fc8e9
Hide whitespace changes
Inline Side-by-side
Showing with 3274 additions and 75 deletions
config/settings.js
View file @ 8519ef67
var ServiceURL = 'http://192.168.3.37:9005';
var ServiceURL = 'http://192.168.2.37:9005';
window.VUE_APP_API = {ServiceURL:ServiceURL}
src/api/alarmEquCtrl.js 0 → 100644
View file @ 8519ef67
import request from '@/utils/request'
export function openAlarm() {
return request({
url: '/api/screenAlarm/openAlarm',
method: 'post',
})
}
export function closeAlarm() {
return request({
url: '/api/screenAlarm/closeAlarm',
method: 'post',
})
}
\ No newline at end of file
src/utils/request.js
View file @ 8519ef67
......@@ -8,7 +8,7 @@ import Config from '@/settings'
// 使请求头可以携带cookie
axios.defaults.withCredentials = true;
//var baseURL = (VUE_APP_API.ServiceURL || process.env.VUE_APP_LOCAL_API) + '/';
// var baseURL = (VUE_APP_API.ServiceURL || process.env.VUE_APP_LOCAL_API) + '/';
var baseURL = process.env.NODE_ENV
=== 'development' ? process.env.VUE_APP_LOCAL_API + '/' : (VUE_APP_API.ServiceURL || process.env.VUE_APP_LOCAL_API) + '/';
......
src/views/Screen/index.vue
View file @ 8519ef67
......@@ -376,6 +376,7 @@ import { Highchart } from '@/assets/js/chartTemplates.js';
import { CoordTransform } from '@/assets/js/CoordTransform.js';
import { getToken, setToken, removeToken } from '@/utils/auth';
import { encrypt } from '@/utils/rsaEncrypt';
import { openAlarm, closeAlarm } from '@/api/alarmEquCtrl.js';
export default {
data() {
......@@ -1075,6 +1076,7 @@ export default {
// 报警弹窗-可变形
m.createAlarmView = function(){
let that = this;
var checkHtml = '';
var list = [{areaCode:1, name:'1111'}];
......@@ -1091,7 +1093,7 @@ export default {
onload: function(o){
var el = o.el, wrap = o.Wrap, morphView = wrap.firstElementChild;
o.setStyle(wrap, {
bottom:'0.3rem', left:'47%', height:0, width:0, zIndex:1,
bottom:'0.3rem', left:'50%', height:0, width:0, zIndex:1,
transformOrigin:'0px 0px',
justifyContent:'center',
});
......@@ -1114,18 +1116,37 @@ export default {
});
// <input type="checkbox" value="0" checked />全选</div>
el.innerHTML = `<div class="content">
<div class="optBtnWrapper">
<a class="button alarm" style="display:none;">开始</a>
<a class="button alarm" id="startAlarmBtn">开始</a>
<a class="button stop" id="stopAlarmBtn">停止</a>
el.innerHTML = `
<div class="content">
<div class="fixed">
<dl class="scrolling4"></dl>
</div>
<div class="fixed"><dl class="scrolling4"></dl></div><i class="el-icon-circle-close"></i></div><div class="el-icon-bell">`;
<i class="el-icon-circle-close"></i>
</div>
<div class="el-icon-bell"></div>
`;
var content = el.firstElementChild;
o.scroll = content.firstElementChild.firstElementChild;
const optBtnWrapper = document.createElement('div');
optBtnWrapper.className = 'optBtnWrapper';
const startAlarmBtn = document.createElement('a');
startAlarmBtn.className = 'button alarm';
startAlarmBtn.id = 'startAlarmBtn';
startAlarmBtn.innerHTML = '开始';
const stopAlarmBtn = document.createElement('a');
stopAlarmBtn.className = 'button stop';
stopAlarmBtn.id = 'stopAlarmBtn';
stopAlarmBtn.innerHTML = '停止';
el.appendChild(optBtnWrapper);
optBtnWrapper.appendChild(startAlarmBtn);
optBtnWrapper.appendChild(stopAlarmBtn);
o.updateList = function(list){
var dds = '';
for(var item of list){
......@@ -1141,54 +1162,46 @@ export default {
o.shrink = true;
}else if(tag.className === 'el-icon-bell'){
o.shrink = false;
}else if(tag.id === 'startAlarmBtn'){
qf.UI.loading({zIndex:2051, timer:2000});
reqApi.common.requst('post','/api/screenAlarm/openAlarm', {}).then(res=>{
if(res.code === 200){
new qf.UI.Notify({
};
};
startAlarmBtn.addEventListener('click', () => {
openAlarm().then(res=>{
res.body===200?new qf.UI.Notify({
position: 'top',
zIndex:2050,
type: 'success',
duration: 3000,
autoOpen:true,
message: res.body,
});
}else{
new qf.UI.Notify({
}):new qf.UI.Notify({
position: 'top',
zIndex:2050,
type: 'warning',
duration: 3000,
autoOpen:true,
message: res.body,
});
}
});
}else if(tag.id === 'stopAlarmBtn'){
qf.UI.loading({zIndex:2051, timer:2000});
reqApi.common.requst('post','/api/screenAlarm/closeAlarm', {}).then(res=>{
if(res.code === 200){
new qf.UI.Notify({
})
})
});
stopAlarmBtn.addEventListener('click', () => {
closeAlarm().then(res=>{
res.body===200?new qf.UI.Notify({
position: 'top',
zIndex:2050,
type: 'success',
duration: 3000,
autoOpen:true,
message: res.body,
});
}else{
new qf.UI.Notify({
}):new qf.UI.Notify({
position: 'top',
zIndex:2050,
type: 'warning',
duration: 3000,
autoOpen:true,
message: res.body,
});
}
});
};
};
})
})
});
},
});
......@@ -1947,6 +1960,7 @@ export default {
// 去除版权信息
viewer._cesiumWidget._creditContainer.style.display = "none";
var path = process.env.VUE_APP_D3Tileset + '/tileset.json';
console.log('path', path)
var localTile = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
url: path,
//maximumScreenSpaceError:1,
......@@ -2085,42 +2099,7 @@ export default {
@font-face {font-family:"zhengdao";src: url("~@/assets/fonts/pangmenzhengdao2.0.ttf");};
.font_digit{font-family:diget year;}
.font_zhengdao{font-family:zhengdao;}
// 20241206
.optBtnWrapper{
display: flex;
gap: .1rem;
position: absolute;
right: -0.9rem;
align-items: center;
flex-direction: column;
top: 50%;
transform: translateY(-50%);
.button {
padding: 0.1rem 0.2rem;
font-size: 0.16rem;
border: none;
border-radius: 8px;
cursor: pointer;
transition: background-color 0.3s ease;
box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2);
}
.alarm {
background-color: #f44336; /* 红色 */
}
.alarm:hover {
background-color: #d32f2f; /* 深红色 */
}
.stop {
background-color: #4caf50; /* 绿色 */
}
.stop:hover {
background-color: #388e3c; /* 深绿色 */
}
}
.Screen {
position:relative;height:100%;width:100%;overflow:hidden;
......@@ -3018,6 +2997,7 @@ export default {
color:#fff;
width:0;height:0;
display:flex;justify-content:center;align-items:center;user-select:none;
position: relative;
.content{
position:absolute;bottom:0;background-color:rgba(0,0,0,.5);border:1px solid #3EB7EA;opacity:1;
}
......@@ -3166,4 +3146,39 @@ export default {
transform: rotate(-360deg);
}
}
</style>
<style lang='scss'>
// 20241207
.optBtnWrapper{
display: flex;
gap: .1rem;
position: absolute;
right: -3.4rem;
align-items: center;
flex-direction: column;
top: -0.7rem;
transform: translateY(-50%);
.button {
padding: 0.1rem 0.2rem;
font-size: 0.16rem;
border: none;
border-radius: 8px;
cursor: pointer;
transition: background-color 0.3s ease;
box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2);
}
.alarm {
background-color: #f44336; /* 红色 */
}
.alarm:hover {
background-color: #d32f2f; /* 深红色 */
}
.stop {
background-color: #4caf50; /* 绿色 */
}
.stop:hover {
background-color: #388e3c; /* 深绿色 */
}
}
</style>
\ No newline at end of file
src/views/Screen/indexjunbao.vue 0 → 100644
View file @ 8519ef67
This source diff could not be displayed because it is too large. You can view the blob instead.
vue.config.js
View file @ 8519ef67
......@@ -54,13 +54,13 @@ module.exports = {
errors: true
},
proxy: {
/* '/api': {
target: process.env.VUE_APP_BASE_API,
'/Apps': {
target: 'http://localhost:8080',
changeOrigin: true,
pathRewrite: {
'^/api': 'api'
'^/Apps': '/Apps'
}
}, */
},
'/auth': {
target: process.env.VUE_APP_BASE_API,
changeOrigin: true,
......
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