Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
This commit is contained in:
commit
7704980132
@ -8,7 +8,7 @@ NODE_ENV = "production"
|
||||
# VITE_API_URL = 'http://jxj.zhgdyun.com:100'
|
||||
# VITE_API_URL = 'http://jxj.zhgdyun.com:33981'
|
||||
# 沈阳合盈线上
|
||||
VITE_API_URL = "http://101.43.164.214:45022"
|
||||
# VITE_API_URL = "http://101.43.164.214:45022"
|
||||
# 嘉兴王江泾公用码头
|
||||
# VITE_API_URL = "http://183.249.224.118:9003"
|
||||
|
||||
@ -44,6 +44,8 @@ VITE_API_URL = "http://101.43.164.214:45022"
|
||||
# VITE_API_URL = 'http://jxj.zhgdyun.com:18000'
|
||||
# 大连金笔
|
||||
# VITE_API_URL = 'http://101.43.164.214:11126'
|
||||
# 新能源智慧基建管理平台
|
||||
VITE_API_URL = 'http://121.37.106.37:9820'
|
||||
# 打包
|
||||
VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url='
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ export const BAIDU_MAP_KEY: string = "";
|
||||
export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
|
||||
|
||||
// 项目环境标识配置 部署时需更改对应的项目
|
||||
export const COMPANY: string = ""; //标准版
|
||||
// export const COMPANY: string = ""; //标准版
|
||||
// export const COMPANY: string = "zhzrf"; //中海·臻如府
|
||||
// export const COMPANY: string = "zsbf"; //中水北方
|
||||
// export const COMPANY: string = "as"; //鞍山项目
|
||||
@ -53,3 +53,6 @@ export const COMPANY: string = ""; //标准版
|
||||
// export const COMPANY: string = "jzjt"; //九柱集团
|
||||
// export const COMPANY: string = "whzt"; //武汉中铁
|
||||
// export const COMPANY: string = "ztsyj"; // 中铁十一局
|
||||
export const COMPANY: string = "xnyzhjj"; // 新能源智慧基建管理平台
|
||||
|
||||
|
||||
|
||||
@ -1928,4 +1928,50 @@ export const ZTSYJMenu: Array<any> = [
|
||||
modulePath: "/vehicleManagspeed"
|
||||
},
|
||||
|
||||
] // 中铁十一局
|
||||
] // 中铁十一局
|
||||
export const XNYZHJJMenu: Array<any> = [
|
||||
{
|
||||
moduleName: "项目信息管理",
|
||||
modulePath: "/projectOverview",
|
||||
},
|
||||
{
|
||||
moduleName: "人员管理",
|
||||
modulePath: "/laborManagement",
|
||||
menuList: [
|
||||
{
|
||||
menuName: "人员管理",
|
||||
companyPath: "/laborManagement"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
moduleName: "进度管理",
|
||||
modulePath: "/schedulePlan",
|
||||
menuList: [
|
||||
{
|
||||
menuName: "进度管理",
|
||||
companyPath: "/schedulePlan"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
moduleName: "安全管理",
|
||||
modulePath: "/securityManagement"
|
||||
},
|
||||
{
|
||||
moduleName: "质量管理",
|
||||
modulePath: "/qualityManagement"
|
||||
},
|
||||
{
|
||||
moduleName: "车辆管理",
|
||||
modulePath: "/vehicleManagement"
|
||||
},
|
||||
{
|
||||
moduleName: "环境监测",
|
||||
modulePath: "/headNoise"
|
||||
},
|
||||
{
|
||||
moduleName: "视频管理",
|
||||
modulePath: "/videoManagement"
|
||||
},
|
||||
] // 新能源智慧基建管理平台
|
||||
|
||||
@ -365,7 +365,7 @@
|
||||
<div style="width: 20%">报警时间</div>
|
||||
<div style="width: 30%">报警信息</div>
|
||||
</div>
|
||||
<el-scrollbar class="list-box">
|
||||
<el-scrollbar class="list-box" @scroll="handleScroll" ref="refScrollbar">
|
||||
<div v-for="(item, index) in listData" class="list-style" :key="item.id">
|
||||
<div style="width: 7%">{{ index + 1 }}</div>
|
||||
<div style="width: 13%">{{ item.workerName }}</div>
|
||||
@ -392,6 +392,7 @@
|
||||
// import { getWorkerInfoList } from "@/assets/js/api/laborPerson";
|
||||
import {
|
||||
getAlarmRecordInfoApi,
|
||||
getAlarmRecordInfoApiPage,
|
||||
getHatDevOptionApi,
|
||||
addstandardDevApi,
|
||||
getRealtimeRecordInfo,
|
||||
@ -429,7 +430,7 @@ import type { FormInstance, FormRules } from "element-plus";
|
||||
import Card from "@/components/card.vue";
|
||||
import * as echarts from "echarts";
|
||||
const store = GlobalStore();
|
||||
import { computed, reactive, ref, onMounted, onBeforeMount, watch } from "vue";
|
||||
import { computed, reactive, ref, onMounted, nextTick, onBeforeMount, watch } from "vue";
|
||||
var mouseTool;
|
||||
var marker;
|
||||
var lineArr;
|
||||
@ -484,7 +485,7 @@ let addForm = ref({
|
||||
});
|
||||
let pagInfo = ref({
|
||||
pageNo: 1, //页数
|
||||
pageSize: 10, //条数
|
||||
pageSize: 30, //条数
|
||||
total: 0 //总条数
|
||||
});
|
||||
let pagLabor = ref({
|
||||
@ -1251,24 +1252,72 @@ function getCrewListData() {
|
||||
}
|
||||
});
|
||||
}
|
||||
const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
|
||||
const moreScroll = ref(true as any);
|
||||
|
||||
// 智能安全帽--查询报警信息
|
||||
function getProgressListData() {
|
||||
let data = {
|
||||
// pageNo: pagInfo.value.pageNo,
|
||||
// pageSize: pagInfo.value.pageSize,
|
||||
pageNo: pagInfo.value.pageNo,
|
||||
pageSize: pagInfo.value.pageSize,
|
||||
devSns: alarmDevSn.value,
|
||||
type: 1, // 设备类型(1：安全帽;2:安全带)
|
||||
projectSn: store.sn
|
||||
};
|
||||
getAlarmRecordInfoApi(data).then(res => {
|
||||
getAlarmRecordInfoApiPage(data).then(res => {
|
||||
moreScroll.value = false;
|
||||
console.log("👇智能安全帽--查询报警信息");
|
||||
console.log(res);
|
||||
if (res.code == 200) {
|
||||
listData.value = res.result;
|
||||
listData.value = listData.value.concat(res.result.records);
|
||||
// listData.value = res.result.records
|
||||
console.log("listData.value=============", listData.value);
|
||||
|
||||
pagInfo.value.total = res.result.total;
|
||||
nextTick(() => {
|
||||
moreScroll.value = true;
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// 新智能安全帽-分页
|
||||
function handleScroll(event) {
|
||||
console.log("event", event);
|
||||
|
||||
refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
|
||||
const scrollTop = e.target.scrollTop;
|
||||
const scrollHeight = e.target.scrollHeight;
|
||||
const clientHeight = e.target.clientHeight;
|
||||
|
||||
console.log("event", event);
|
||||
// console.log("e.target.scrollTop", e.target.scrollTop);
|
||||
// console.log("e.target.scrollHeight", e.target.scrollHeight);
|
||||
// console.log("e.target.clientHeight", e.target.clientHeight);
|
||||
|
||||
// console.log("moreScroll.value", moreScroll.value);
|
||||
|
||||
// 向上加载更多
|
||||
if (scrollTop >= scrollHeight - clientHeight - 1) {
|
||||
if (moreScroll.value) {
|
||||
console.log("===================加载第二页===================");
|
||||
pagInfo.value.pageNo += 1;
|
||||
console.log("pagInfo.value.pageNo", pagInfo.value.pageNo);
|
||||
moreScroll.value = false;
|
||||
getProgressListData();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// const { scrollTop, scrollHeight, clientHeight } = event.target;
|
||||
// // 判断是否滚动到底部
|
||||
// if (scrollTop + clientHeight >= scrollHeight) {
|
||||
// // 触发滚动到底部的事件
|
||||
// console.log("===================加载第二页===================");
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
function fenceNameChange(e) {
|
||||
console.log("围栏名称", e);
|
||||
fenceSearch.value = e;
|
||||
|
||||
@ -165,7 +165,8 @@ import {
|
||||
BTHGMenu,
|
||||
DLJBMenu,
|
||||
WHZTMenu,
|
||||
ZTSYJMenu
|
||||
ZTSYJMenu,
|
||||
XNYZHJJMenu
|
||||
} from "@/config/staticMenu";
|
||||
import { COMPANY } from "@/config/config";
|
||||
|
||||
@ -652,6 +653,9 @@ onMounted(async () => {
|
||||
if (COMPANY === "ztsyj") {
|
||||
menuList.value = ZTSYJMenu;
|
||||
}
|
||||
if(COMPANY === "xnyzhjj") {
|
||||
menuList.value = XNYZHJJMenu;
|
||||
}
|
||||
console.log("配置菜单", menuList.value);
|
||||
console.log("当前跳转的路由", router.currentRoute.value);
|
||||
// await getAllModelMenu();
|
||||
@ -743,6 +747,8 @@ function jumpBgd() {
|
||||
window.location.replace("http://182.90.224.237:15551/#/login?token=" + store.token);
|
||||
} else if (COMPANY === "scwc") {
|
||||
window.location.replace("http://192.168.9.249:9809/#/login?token=" + store.token);
|
||||
} else if (COMPANY === "xnyzhjj") {
|
||||
window.location.replace("http://121.37.106.37:9809/#/login?token=" + store.token);
|
||||
} else if (envList.includes(COMPANY)) {
|
||||
window.location.replace(BASEURL + "/#/login?token=" + store.token);
|
||||
} else {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user