admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flx:修复

Browse Source
This commit is contained in:
Rain_ 2025-11-13 11:51:36 +08:00
parent 5b18d6ae77
commit c6d0d510ac
4 changed files with 611 additions and 1188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/config.js
View File

@ -23,8 +23,8 @@ var COMPANY = ""; //通用
// COMPANY = 'hfqc' //乌丹站舍(合肥启程)
// COMPANY = 'mulei' //木垒
// COMPANY = 'xjw' //新金湾
COMPANY = 'chaozhou' //潮州
// COMPANY = 'gsgs' //广深高速
// COMPANY = 'chaozhou' //潮州
// COMPANY = 'gsgs' //广深高速
var PROJECT = {
local_test: "common", // 普通版

1258
src/components/videoModule/isc_plugin/isc_plugin_h5.vue
View File

File diff suppressed because it is too large Load Diff

4
src/store/index.js
View File

@ -103,7 +103,7 @@ export default new Vuex.Store({
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址
// WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
PREVIEWURL: "http://219.147.96.221:8012/onlinePreview",
// UPLOADURL: 'http://192.168.34.221:8111/upload/image', //演示平台 雄本地
// FILEURL: 'http://192.168.34.221:8111/image/', //演示平台 雄本地
@ -400,7 +400,7 @@ export default new Vuex.Store({
// state.initializeAI();
},
initializeAI(state) {
if (state.projectExtendInfo ? .modelKey && state.projectExtendInfo ? .modelUrl) {
if (state.projectExtendInfo?.modelKey && state.projectExtendInfo?.modelUrl) {
console.log('正在初始化AI功能...');
initAI(state.projectExtendInfo.modelKey, state.projectExtendInfo.modelUrl);
} else {

533
src/views/companyAdmin/companyBigScreen/components/header.vue
View File

@ -1,16 +1,16 @@
<template>
<div class="header-wrap">
<div class="left-text">
<div class="left-text_title">
<img
@click="handleEdit"
class="edit-icon"
src="@/assets/images/companyBigScreen/card-edit-icon.png"
alt="icon"
/>
{{ customInfo.name || "智慧工地企业版数据大屏" }}
</div>
<!-- <div
<div class="header-wrap">
<div class="left-text">
<div class="left-text_title">
<img
@click="handleEdit"
class="edit-icon"
src="@/assets/images/companyBigScreen/card-edit-icon.png"
alt="icon"
/>
{{ customInfo.name || "智慧工地企业版数据大屏" }}
</div>
<!-- <div
class="left-text_image"
@click="onRouterLink('/companyAdmin/terminalOperation')"
>
@ -22,8 +22,8 @@
>
视频监控
</div> -->
</div>
<!-- <div class="nav-list">
</div>
<!-- <div class="nav-list">
<div class="nav-item" :class="{ 'nav-active': pageIndex == 1 }" @click="changeNav(1)">集团中心</div>
<div class="nav-item right-nav" :class="{ 'nav-active': pageIndex == 2 }">视频中心</div>
</div> -->
@ -41,6 +41,7 @@
<!-- <img src="@/assets/images/bigScreen/icon-close.png" /> -->
</div>
</div>
</div>
</template>
<script>
@ -50,272 +51,272 @@ import { getWeatherLiveData } from "@/assets/js/api/environmentManage";
import { getQueryBySnCompanyInfo } from "@/assets/js/api/companyBigScreen";
import { queryCustomConfig } from "@/assets/js/api/common";
export default {
naem: "headers",
components: { HeaderDialog },
data() {
return {
pageIndex: 1,
nowDate: "",
nowTime: "",
timer: null,
weatherInfo: {},
customInfo: {},
customData: {},
isEdit: false,
};
naem: "headers",
components: { HeaderDialog },
data() {
return {
pageIndex: 1,
nowDate: "",
nowTime: "",
timer: null,
weatherInfo: {},
customInfo: {},
customData: {},
isEdit: false,
};
},
mounted() {
this.timer = setInterval(() => {
let date = new Date();
this.nowDate = moment(date).format("YYYY年MM月DD日");
this.nowTime = moment(date).format("HH:mm:ss");
}, 1000);
this.getCompanyInfoData();
this.getCustomConfig();
},
beforeDestroy() {
this.timer = null;
},
methods: {
async getCustomConfig() {
const res = await queryCustomConfig({
configKey: "company_header1",
projectSn: this.$store.state.userInfo.sn,
});
console.log(res);
this.isEdit = res.result?.id ? true : false;
if (res.result) {
const { data: curIsCustom } = JSON.parse(
res.result.configValue || "{}"
);
console.log(112333, curIsCustom);
this.customInfo = curIsCustom;
this.customData = res.result;
}
},
mounted() {
this.timer = setInterval(() => {
let date = new Date();
this.nowDate = moment(date).format("YYYY年MM月DD日");
this.nowTime = moment(date).format("HH:mm:ss");
}, 1000);
this.getCompanyInfoData();
this.getCustomConfig();
getDeviceConfig() {
console.log(111);
this.getCustomConfig();
},
beforeDestroy() {
this.timer = null;
handleEdit() {
this.$refs.headerDialogRef.showModal(
this.isEdit ? this.customData : null
);
},
methods: {
async getCustomConfig() {
const res = await queryCustomConfig({
configKey: "company_header1",
projectSn: this.$store.state.userInfo.sn,
});
console.log(res);
this.isEdit = res.result?.id ? true : false;
if (res.result) {
const { data: curIsCustom } = JSON.parse(
res.result.configValue || "{}"
);
console.log(112333, curIsCustom);
this.customInfo = curIsCustom;
this.customData = res.result;
}
},
getDeviceConfig() {
console.log(111);
this.getCustomConfig();
},
handleEdit() {
this.$refs.headerDialogRef.showModal(
this.isEdit ? this.customData : null
);
},
async getCompanyInfoData() {
const res = await getQueryBySnCompanyInfo({
sn: this.$store.state.userInfo.sn,
});
console.log(res);
this.loadWeather(res.result.cityCode);
},
onRouterLink(path) {
this.$router.push(path);
},
changeNav(val) {
this.pageIndex = val;
this.$emit("changeType", val);
},
closeFn() {
// window.close()
// this.$router.back()
// 退出到企业首页
this.$router.push("/firm/projectManage");
},
loadWeather(cityCode) {
getWeatherLiveData({ cityid: cityCode || "" }).then((res) => {
this.weatherInfo = res.result;
console.log(this.weatherInfo);
});
},
async getCompanyInfoData() {
const res = await getQueryBySnCompanyInfo({
sn: this.$store.state.userInfo.sn,
});
console.log(res);
this.loadWeather(res.result.cityCode);
},
onRouterLink(path) {
this.$router.push(path);
},
changeNav(val) {
this.pageIndex = val;
this.$emit("changeType", val);
},
closeFn() {
// window.close()
// this.$router.back()
// 退出到企业首页
this.$router.push("/firm/projectManage");
},
loadWeather(cityCode) {
getWeatherLiveData({ cityid: cityCode || "" }).then((res) => {
this.weatherInfo = res.result;
console.log(this.weatherInfo);
});
},
},
};
</script>
<style lang="less" scoped>
.header-wrap {
width: 100%;
height: 66px;
text-align: center;
width: 100%;
height: 66px;
text-align: center;
position: absolute;
top: 0;
left: 0;
z-index: 10;
background: url("~@/assets/images/companyBigScreen/header-bg.png") center
no-repeat;
background-size: 100%;
.left-text {
position: absolute;
top: 0;
left: 0;
z-index: 10;
background: url("~@/assets/images/companyBigScreen/header-bg.png") center
no-repeat;
background-size: 100%;
.left-text {
position: absolute;
left: 30px;
top: 50%;
transform: translateY(-50%);
font-family: Alibaba PuHuiTi, Alibaba PuHuiTi;
font-weight: 500;
font-size: 32px;
color: #ffffff;
line-height: 32px;
display: flex;
align-items: center;
.left-text_title {
position: relative;
&:hover {
.edit-icon {
visibility: visible;
}
}
.edit-icon {
position: absolute;
top: 0px;
left: 0px;
transform: translateX(-50%);
visibility: hidden;
width: 20px;
height: 20px;
cursor: pointer;
user-select: none;
-webkit-user-drag: none;
z-index: 10;
}
}
.left-text_image {
font-size: 20px;
color: #00f6ff;
margin-left: 13px;
width: 104px;
height: 45px;
background-image: url("~@/assets/images/companyBigScreen/stat-bg.png");
background-size: 100% 100%;
background-repeat: no-repeat;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
}
}
}
.header-wrap2 {
width: 100%;
height: 45px;
text-align: center;
position: absolute;
top: 0;
left: 0;
z-index: 10;
background: url("~@/assets/images/bigScreen/hengTong_title.png") center
no-repeat;
background-size: 103%;
.left-text {
color: #02fbe2;
position: absolute;
left: 48px;
line-height: 32px;
font-size: 10px;
}
}
.nav-list {
color: #fff;
font-size: 16px;
position: absolute;
top: 0;
left: 50%;
transform: translateX(-50%);
display: flex;
height: 40px;
width: 35%;
justify-content: space-between;
align-items: center;
}
.nav-item {
padding: 0 40px;
height: 40px;
line-height: 36px;
position: relative;
cursor: pointer;
}
.nav-active {
color: #02fbe2;
}
.nav-active::after {
content: "";
border-bottom: 1px dashed rgba(2, 251, 226, 1);
position: absolute;
bottom: 8px;
left: 50%;
height: 11px;
display: block;
width: 73px;
transform: translateX(-50%);
background: linear-gradient(
to top,
rgba(2, 251, 226, 0.7),
rgba(2, 251, 226, 0)
);
}
.right-box {
display: flex;
align-items: center;
position: absolute;
right: 0;
left: 30px;
top: 50%;
transform: translateY(-50%);
.date {
background: rgba(34, 33, 37, 0.5);
border: 1px solid #3e3c42;
font-family: Alibaba PuHuiTi, Alibaba PuHuiTi;
font-weight: 500;
font-size: 20px;
color: #ffffff;
line-height: 24px;
padding: 4px 30px;
margin-right: 30px;
}
.time {
font-family: Alibaba Sans, Alibaba Sans;
font-weight: 500;
font-size: 20px;
color: #dfdaee;
line-height: 24px;
margin-right: 30px;
i {
margin-right: 2px;
font-family: Alibaba PuHuiTi, Alibaba PuHuiTi;
font-weight: 500;
font-size: 32px;
color: #ffffff;
line-height: 32px;
display: flex;
align-items: center;
.left-text_title {
position: relative;
&:hover {
.edit-icon {
visibility: visible;
}
}
.weather-box {
display: flex;
align-items: center;
margin-right: 30px;
.line {
width: 4px;
height: 20px;
background: #959397;
}
span {
font-family: Segoe UI, Segoe UI;
font-weight: 400;
font-size: 20px;
color: #dfdaee;
line-height: 26px;
margin-left: 12px;
}
}
.close-btn {
margin-right: 30px;
padding: 4px 20px;
background: rgba(0, 107, 255, 0.5);
border: 1px solid #006bff;
}
.edit-icon {
position: absolute;
top: 0px;
left: 0px;
transform: translateX(-50%);
visibility: hidden;
width: 20px;
height: 20px;
cursor: pointer;
i {
font-size: 20px;
color: #ffffff;
margin-right: 2px;
}
span {
font-family: Alibaba PuHuiTi, Alibaba PuHuiTi;
font-weight: 500;
font-size: 20px;
line-height: 24px;
color: #ffffff;
}
user-select: none;
-webkit-user-drag: none;
z-index: 10;
}
}
.left-text_image {
font-size: 20px;
color: #00f6ff;
margin-left: 13px;
width: 104px;
height: 45px;
background-image: url("~@/assets/images/companyBigScreen/stat-bg.png");
background-size: 100% 100%;
background-repeat: no-repeat;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
}
}
}
.header-wrap2 {
width: 100%;
height: 45px;
text-align: center;
position: absolute;
top: 0;
left: 0;
z-index: 10;
background: url("~@/assets/images/bigScreen/hengTong_title.png") center
no-repeat;
background-size: 103%;
.left-text {
color: #02fbe2;
position: absolute;
left: 48px;
line-height: 32px;
font-size: 10px;
}
}
.nav-list {
color: #fff;
font-size: 16px;
position: absolute;
top: 0;
left: 50%;
transform: translateX(-50%);
display: flex;
height: 40px;
width: 35%;
justify-content: space-between;
align-items: center;
}
.nav-item {
padding: 0 40px;
height: 40px;
line-height: 36px;
position: relative;
cursor: pointer;
}
.nav-active {
color: #02fbe2;
}
.nav-active::after {
content: "";
border-bottom: 1px dashed rgba(2, 251, 226, 1);
position: absolute;
bottom: 8px;
left: 50%;
height: 11px;
display: block;
width: 73px;
transform: translateX(-50%);
background: linear-gradient(
to top,
rgba(2, 251, 226, 0.7),
rgba(2, 251, 226, 0)
);
}
.right-box {
display: flex;
align-items: center;
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%);
.date {
background: rgba(34, 33, 37, 0.5);
border: 1px solid #3e3c42;
font-family: Alibaba PuHuiTi, Alibaba PuHuiTi;
font-weight: 500;
font-size: 20px;
color: #ffffff;
line-height: 24px;
padding: 4px 30px;
margin-right: 30px;
}
.time {
font-family: Alibaba Sans, Alibaba Sans;
font-weight: 500;
font-size: 20px;
color: #dfdaee;
line-height: 24px;
margin-right: 30px;
i {
margin-right: 2px;
}
}
.weather-box {
display: flex;
align-items: center;
margin-right: 30px;
.line {
width: 4px;
height: 20px;
background: #959397;
}
span {
font-family: Segoe UI, Segoe UI;
font-weight: 400;
font-size: 20px;
color: #dfdaee;
line-height: 26px;
margin-left: 12px;
}
}
.close-btn {
margin-right: 30px;
padding: 4px 20px;
background: rgba(0, 107, 255, 0.5);
border: 1px solid #006bff;
cursor: pointer;
i {
font-size: 20px;
color: #ffffff;
margin-right: 2px;
}
span {
font-family: Alibaba PuHuiTi, Alibaba PuHuiTi;
font-weight: 500;
font-size: 20px;
line-height: 24px;
color: #ffffff;
}
}
}
</style>