diff --git a/.env.development b/.env.development
index 9e2ebd0..a52099e 100644
--- a/.env.development
+++ b/.env.development
@@ -19,7 +19,7 @@ NODE_ENV = 'development'
# 演示平台
# VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
# 百色七参数线上地址
-VITE_API_URL = 'http://101.43.164.214:11111'
+# VITE_API_URL = 'http://101.43.164.214:11111'
# 七参数标准版(测试平台)
# VITE_API_URL = 'http://jxj.zhgdyun.com:15551'
# 七参数标准版(测试平台)
@@ -44,13 +44,16 @@ VITE_API_URL = 'http://101.43.164.214:11111'
# VITE_API_URL = 'http://jxj.zhgdyun.com:100'
# VITE_API_URL = 'http://jxj.zhgdyun.com:34568'
# 新能源智慧基建管理平台|中新建电力集团(外网)
-VITE_API_URL = 'http://117.146.73.156:9820'
+# VITE_API_URL = 'http://117.146.73.156:9820'
# 九柱集团
# VITE_API_URL = 'http://218.95.151.122:31004'
# 包头化工
# 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:9840'
+VITE_API_URL = 'http://jxj.zhgdyun.com:100'
# 上传
VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='
diff --git a/.env.production b/.env.production
index 9892a5d..13bd210 100644
--- a/.env.production
+++ b/.env.production
@@ -13,7 +13,7 @@ NODE_ENV = "production"
# VITE_API_URL = "http://183.249.224.118:9003"
# 百色 新项目通用地址
-VITE_API_URL = 'http://101.43.164.214:11111'
+# VITE_API_URL = 'http://101.43.164.214:11111'
# 七参数标准版(演示平台)
# VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
@@ -47,12 +47,14 @@ VITE_API_URL = 'http://101.43.164.214:11111'
# 新能源智慧基建管理平台|中新建电力集团(内网)
# VITE_API_URL = 'http://10.30.102.4:9820'
# 新能源智慧基建管理平台|中新建电力集团(外网)
-VITE_API_URL = 'http://117.146.73.156:9820'
+# VITE_API_URL = 'http://117.146.73.156:9820'
# 国维科技
# VITE_API_URL = 'http://10.216.103.99:9820'
# 新能源智慧基建管理平台
# VITE_API_URL = 'http://121.37.106.37:9820'
# VITE_API_URL = 'http://121.37.106.37:9809'
+# 上海电力
+VITE_API_URL = 'http://121.37.106.37:9840'
# 打包
VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url='
diff --git a/src/config/config.ts b/src/config/config.ts
index 8b3ca52..6451d29 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -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,7 +53,7 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
// export const COMPANY: string = "jzjt"; //九柱集团
// export const COMPANY: string = "whzt"; //武汉中铁
// export const COMPANY: string = "ztsyj"; // 中铁十一局
-export const COMPANY: string = "xnyzhjj"; // 新能源智慧基建管理平台|中新建
+// export const COMPANY: string = "xnyzhjj"; // 新能源智慧基建管理平台|中新建
// export const COMPANY: string = "gwkj"; // 国维科技
// export const COMPANY: string = "allxm"; // 安立路项目
// export const COMPANY: string = "hbla"; // 湖北龙澳
diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts
index fa1e3a3..63d732f 100644
--- a/src/routers/modules/staticRouter.ts
+++ b/src/routers/modules/staticRouter.ts
@@ -24,8 +24,8 @@ export const staticRouter: RouteRecordRaw[] = [
{
path: "/large",
name: "大屏",
- // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
- component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
+ component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
+ // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
// component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏
// component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏
// component: () => import("@/views/locationLive/locationL.vue"), //人员定位大屏
diff --git a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
index 8c16ec4..e07c3cf 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
@@ -1646,6 +1646,9 @@ function trackMapInit(path: any, item: any) {
info.push('最后更新时间: ' + item.uploadTime + "
");
info.push('经纬度: ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "
");
info.push('位置: ' + address + "
");
+ info.push('工种: ' + item.workerTypeName + "
");
+ info.push('身份证号: ' + (item.idCard || "暂无") + "
");
+ info.push('联系电话: ' + (item.phoneNumber || "暂无") + "
");
var infoWindow = new AMap.InfoWindow({
offset: new AMap.Pixel(30, -30),
content: info.join("") //使用默认信息窗体框样式，显示信息内容
@@ -2013,6 +2016,9 @@ function echoCarMarker(item) {
info.push('最后更新时间: ' + item.uploadTime + "
");
info.push('经纬度: ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "
");
info.push('位置: ' + address + "
");
+ info.push('工种: ' + item.workerTypeName + "
");
+ info.push('身份证号: ' + (item.idCard || "暂无") + "
");
+ info.push('联系电话: ' + (item.phoneNumber || "暂无") + "
");
let infoWindow = new AMap.InfoWindow({
offset: new AMap.Pixel(30, -30),
@@ -2073,6 +2079,9 @@ function echoPersonMarker(item) {
info.push('最后更新时间: ' + item.uploadTime + "
");
info.push('经纬度: ' + item.longitude.toFixed(6) + "|" + item.latitude.toFixed(6) + "
");
info.push('位置: ' + address + "
");
+ info.push('工种: ' + item.workerTypeName + "
");
+ info.push('身份证号: ' + (item.idCard || "暂无") + "
");
+ info.push('联系电话: ' + (item.phoneNumber || "暂无") + "
");
var infoWindow = new AMap.InfoWindow({
offset: new AMap.Pixel(10, -30),
diff --git a/大屏-上海电力.zip b/大屏-上海电力.zip
new file mode 100644
index 0000000..def350f
Binary files /dev/null and b/大屏-上海电力.zip differ