Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain

This commit is contained in:
X_Rian 2024-06-06 17:01:17 +08:00
commit 18847896db
9 changed files with 5264 additions and 101 deletions

View File

@ -24,7 +24,7 @@ VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
# VITE_API_URL = 'http://182.90.224.237:15551' # VITE_API_URL = 'http://182.90.224.237:15551'
# agjt # agjt
# VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 # VITE_API_URL = 'http://42.180.188.17:9809' #生产环境
# VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 VITE_API_URL = 'http://42.180.188.17:11211' #测试环境
# VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 # VITE_API_URL = 'http://42.180.188.17:11211' #测试环境
# VITE_API_URL = 'http://jxj.zhgdyun.com:19812' # VITE_API_URL = 'http://jxj.zhgdyun.com:19812'
# 苏立信 # 苏立信

View File

@ -22,11 +22,11 @@ NODE_ENV = "production"
# VITE_API_URL = 'http://182.90.224.237:15551' # VITE_API_URL = 'http://182.90.224.237:15551'
# agjt # agjt
# VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 # VITE_API_URL = 'http://42.180.188.17:9809' #生产环境
# VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 VITE_API_URL = 'http://42.180.188.17:11211' #测试环境
# 苏立信 # 苏立信
# VITE_API_URL = 'http://101.43.164.214:11111' # VITE_API_URL = 'http://101.43.164.214:11111'
# 中科安信 # 中科安信
VITE_API_URL = 'http://8.136.222.164:8808' # VITE_API_URL = 'http://8.136.222.164:8808'
# 打包 # 打包
VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url=' VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url='

4903
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -35,8 +35,8 @@
"dhtmlx-gantt": "^8.0.6", "dhtmlx-gantt": "^8.0.6",
"driver.js": "^0.9.8", "driver.js": "^0.9.8",
"echarts": "^4.9.0", "echarts": "^4.9.0",
"echarts-gl": "^2.0.9", "echarts-gl": "^1.1.2",
"echarts-liquidfill": "^3.1.0", "echarts-liquidfill": "^2.0.6",
"element-china-area-data": "^5.0.2", "element-china-area-data": "^5.0.2",
"element-plus": "^2.2.30", "element-plus": "^2.2.30",
"ezuikit-js": "^7.7.8", "ezuikit-js": "^7.7.8",

View File

@ -28,7 +28,7 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
// export const COMPANY: string = "zsbf"; //中水北方 // export const COMPANY: string = "zsbf"; //中水北方
// export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "as"; //鞍山项目
// export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "agjt"; //鞍钢集团
// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏
// export const COMPANY: string = "slx"; //苏立信项目 // export const COMPANY: string = "slx"; //苏立信项目
// export const COMPANY: string = "hfqc"; //合肥启程项目 // export const COMPANY: string = "hfqc"; //合肥启程项目
// export const COMPANY: string = "jsyc"; // 江苏盐城项目 // export const COMPANY: string = "jsyc"; // 江苏盐城项目
@ -37,4 +37,4 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
// export const COMPANY: string = "phmw"; //鄱湖美湾医疗、医美产业集群项目 (需要去src\routers\modules\staticRouter.ts更换首页) // export const COMPANY: string = "phmw"; //鄱湖美湾医疗、医美产业集群项目 (需要去src\routers\modules\staticRouter.ts更换首页)
// export const COMPANY: string = "xjnb"; // 新建宁波项目 // export const COMPANY: string = "xjnb"; // 新建宁波项目
// export const COMPANY: string = "ahsa"; // 安徽水安项目 // export const COMPANY: string = "ahsa"; // 安徽水安项目
export const COMPANY: string = "zkax"; // 中科安信项目 // export const COMPANY: string = "zkax"; // 中科安信项目

View File

@ -1340,7 +1340,7 @@ export const ZKAXMenu: Array<any> = [
modulePath: "/securityManagement" modulePath: "/securityManagement"
}, },
{ {
menuName: "进度计划", moduleName: "进度计划",
companyPath: "/schedulePlan" modulePath: "/schedulePlan"
} }
]; ];

View File

@ -2,35 +2,40 @@
<div class="centerTop"> <div class="centerTop">
<div class="top-content"> <div class="top-content">
<div class="content-div aq"> <div class="content-div aq">
<div class="circle-box"> <!-- <div class="circle-box">
<span>{{ statScore.hiddenDangerScore }}</span> <span>{{ statScore.hiddenDangerScore }}</span>
</div> </div> -->
<span>安全隐患治理</span> <div id="waterAq" style="width:80%;height:80%;transform:translateY(-25px)"></div>
<span style="transform:translateY(-50px)">安全隐患治理</span>
</div> </div>
<div class="content-div wd"> <div class="content-div wd">
<div class="circle-box"> <!-- <div class="circle-box">
<span>{{ statScore.dangerEngScore }}</span> <span>{{ statScore.dangerEngScore }}</span>
</div> </div> -->
<span>危大工程</span> <div id="waterWd" style="width:80%;height:80%;transform:translateY(-25px)"></div>
<span style="transform:translateY(-50px)">危大工程</span>
</div> </div>
<div class="content-div jy"> <div class="content-div jy">
<div class="circle-box"> <!-- <div class="circle-box"> -->
<!-- <span>{{statScore}}</span> --> <!-- <span>{{statScore}}</span> -->
<span>25</span> <!-- <span>25</span>
</div> </div> -->
<span>安全教育</span> <div id="waterJy" style="width:80%;height:80%;transform:translateY(-25px)"></div>
<span style="transform:translateY(-50px)">安全教育</span>
</div> </div>
<div class="content-div fx"> <div class="content-div fx">
<div class="circle-box"> <!-- <div class="circle-box">
<span>{{ statScore.riskScore }}</span> <span>{{ statScore.riskScore }}</span>
</div> </div> -->
<span>风险管理</span> <div id="waterFx" style="width:80%;height:80%;transform:translateY(-25px)"></div>
<span style="transform:translateY(-50px)">风险管理</span>
</div> </div>
<div class="content-div zn"> <div class="content-div zn">
<div class="circle-box"> <!-- <div class="circle-box">
<span>{{ statScore.aiScore }}</span> <span>{{ statScore.aiScore }}</span>
</div> </div> -->
<span>AI警报</span> <div id="waterZn" style="width:80%;height:80%;transform:translateY(-25px)"></div>
<span style="transform:translateY(-50px)">AI警报</span>
</div> </div>
<div class="count-div"> <div class="count-div">
<div class="count-div-item"> <div class="count-div-item">
@ -107,6 +112,8 @@ import Card from "@/components/card.vue";
import { ref, onMounted, watch } from "vue"; import { ref, onMounted, watch } from "vue";
import { GlobalStore } from "@/stores"; import { GlobalStore } from "@/stores";
import { ElMessage } from "element-plus"; import { ElMessage } from "element-plus";
import * as echarts from "echarts";
import 'echarts-liquidfill';
import { editProjectInfo, eidtProjectShowConfig, queryBySnData } from "@/api/modules/projectOverview"; import { editProjectInfo, eidtProjectShowConfig, queryBySnData } from "@/api/modules/projectOverview";
import { getStatsDirectorateBigScreenApi, getStatScoreApi } from "@/api/modules/agjtCommandApi"; import { getStatsDirectorateBigScreenApi, getStatScoreApi } from "@/api/modules/agjtCommandApi";
@ -141,6 +148,401 @@ watch(
} }
} }
); );
//
function drawAqWater(){
type EChartsOption = echarts.EChartsOption;
var chartDom = document.getElementById("waterAq")!;
var myChart = echarts.init(chartDom);
var option: EChartsOption;
//
option = {
series: [
{
type: "liquidFill", //
// data: [0.6], // 01
data:[0.001,0.001,0.001,0.001,0.001], //
// data: [
// 0.2,
// {
// value: 0.3, //
// direction: "left", //
// itemStyle: {
// color: "blue", //
// opacity: 0.8, //
// },
// emphasis: {
// itemStyle: {
// color: "lightblue", //
// opacity: 1, //
// },
// },
// },
// ],
waveAnimation:true,//,
amplitude: 15, //
waveLength:150,//
shape: "circle", //'circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow'
direction: "right", //'left', 'right', 'top', 'bottom',
radius: "60%", // 50%
// color:['#1E90FF','#191970','#000080','#6495ED','#0000FF'] ,//
color:['#156ACF'] ,//
center:['50%','50%'],//1E90FF
// animationEasing:'linear',
animationEasing:'easeOut',
outline: {
borderDistance: 4, //
itemStyle: {
borderWidth: 2, //
borderColor: "#156ACF", //
},
},
// //
// itemStyle:{
// opacity:0.5, //
// color:'red', //
// shadowBlur:10, //
// shadowColor:'red', //
// shadowOffsetX:10, //
// shadowOffsetY:10, //
// },
backgroundStyle: {
color: "rgba(0,0,0,0)", //
},
label: {
normal: {
formatter: function(){
return statScore.value.hiddenDangerScore + "分"
},
textStyle: {
// color: "#6495ED", //
color: "#fff",
insideColor: "#fff",
fontSize: 16,
},
},
},
},
],
};
// 使
myChart.setOption(option);
}
//
function drawWdWater(){
type EChartsOption = echarts.EChartsOption;
var chartDom = document.getElementById("waterWd")!;
var myChart = echarts.init(chartDom);
var option: EChartsOption;
//
option = {
series: [
{
type: "liquidFill", //
// data: [0.6], // 01
data:[0.001,0.001,0.001,0.001,0.001], //
// data: [
// 0.2,
// {
// value: 0.3, //
// direction: "left", //
// itemStyle: {
// color: "blue", //
// opacity: 0.8, //
// },
// emphasis: {
// itemStyle: {
// color: "lightblue", //
// opacity: 1, //
// },
// },
// },
// ],
waveAnimation:true,//,
amplitude: 15, //
waveLength:150,//
shape: "circle", //'circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow'
direction: "right", //'left', 'right', 'top', 'bottom',
radius: "60%", // 50%
// color:['#1E90FF','#191970','#000080','#6495ED','#0000FF'] ,//
color:['#156ACF'] ,//
center:['50%','50%'],//1E90FF
// animationEasing:'linear',
animationEasing:'easeOut',
outline: {
borderDistance: 4, //
itemStyle: {
borderWidth: 2, //
borderColor: "#156ACF", //
},
},
// //
// itemStyle:{
// opacity:0.5, //
// color:'red', //
// shadowBlur:10, //
// shadowColor:'red', //
// shadowOffsetX:10, //
// shadowOffsetY:10, //
// },
backgroundStyle: {
color: "rgba(0,0,0,0)", //
},
label: {
normal: {
formatter: function(){
return statScore.value.dangerEngScore + "分"
},
textStyle: {
color: "#fff",
insideColor: "#fff",
fontSize: 16,
},
},
},
},
],
};
// 使
myChart.setOption(option);
}
//
function drawJyWater(){
type EChartsOption = echarts.EChartsOption;
var chartDom = document.getElementById("waterJy")!;
var myChart = echarts.init(chartDom);
var option: EChartsOption;
//
option = {
series: [
{
type: "liquidFill", //
// data: [0.6], // 01
data:[0.001,0.001,0.001,0.001,0.001], //
// data: [
// 0.2,
// {
// value: 0.3, //
// direction: "left", //
// itemStyle: {
// color: "blue", //
// opacity: 0.8, //
// },
// emphasis: {
// itemStyle: {
// color: "lightblue", //
// opacity: 1, //
// },
// },
// },
// ],
waveAnimation:true,//,
amplitude: 15, //
waveLength:150,//
shape: "circle", //'circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow'
direction: "right", //'left', 'right', 'top', 'bottom',
radius: "60%", // 50%
// color:['#1E90FF','#191970','#000080','#6495ED','#0000FF'] ,//
color:['#156ACF'] ,//
center:['50%','50%'],//1E90FF
// animationEasing:'linear',
animationEasing:'easeOut',
outline: {
borderDistance: 4, //
itemStyle: {
borderWidth: 2, //
borderColor: "#156ACF", //
},
},
// //
// itemStyle:{
// opacity:0.5, //
// color:'red', //
// shadowBlur:10, //
// shadowColor:'red', //
// shadowOffsetX:10, //
// shadowOffsetY:10, //
// },
backgroundStyle: {
color: "rgba(0,0,0,0)", //
},
label: {
normal: {
formatter: function(){
// return statScore.value + ""
return "25分"
},
textStyle: {
color: "#fff",
insideColor: "#fff",
fontSize: 16,
},
},
},
},
],
};
// 使
myChart.setOption(option);
}
//
function drawFxWater(){
type EChartsOption = echarts.EChartsOption;
var chartDom = document.getElementById("waterFx")!;
var myChart = echarts.init(chartDom);
var option: EChartsOption;
//
option = {
series: [
{
type: "liquidFill", //
// data: [0.6], // 01
data:[0.001,0.001,0.001,0.001,0.001], //
// data: [
// 0.2,
// {
// value: 0.3, //
// direction: "left", //
// itemStyle: {
// color: "blue", //
// opacity: 0.8, //
// },
// emphasis: {
// itemStyle: {
// color: "lightblue", //
// opacity: 1, //
// },
// },
// },
// ],
waveAnimation:true,//,
amplitude: 15, //
waveLength:150,//
shape: "circle", //'circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow'
direction: "right", //'left', 'right', 'top', 'bottom',
radius: "60%", // 50%
// color:['#1E90FF','#191970','#000080','#6495ED','#0000FF'] ,//
color:['#156ACF'] ,//
center:['50%','50%'],//1E90FF
// animationEasing:'linear',
animationEasing:'easeOut',
outline: {
borderDistance: 4, //
itemStyle: {
borderWidth: 2, //
borderColor: "#156ACF", //
},
},
// //
// itemStyle:{
// opacity:0.5, //
// color:'red', //
// shadowBlur:10, //
// shadowColor:'red', //
// shadowOffsetX:10, //
// shadowOffsetY:10, //
// },
backgroundStyle: {
color: "rgba(0,0,0,0)", //
},
label: {
normal: {
formatter: function(){
return statScore.value.riskScore + "分"
},
textStyle: {
color: "#fff",
insideColor: "#fff",
fontSize: 16,
},
},
},
},
],
};
// 使
myChart.setOption(option);
}
//
function drawZnWater(){
type EChartsOption = echarts.EChartsOption;
var chartDom = document.getElementById("waterZn")!;
var myChart = echarts.init(chartDom);
var option: EChartsOption;
//
option = {
series: [
{
type: "liquidFill", //
// data: [0.6], // 01
data:[0.001,0.001,0.001,0.001,0.001], //
// data: [
// 0.2,
// {
// value: 0.3, //
// direction: "left", //
// itemStyle: {
// color: "blue", //
// opacity: 0.8, //
// },
// emphasis: {
// itemStyle: {
// color: "lightblue", //
// opacity: 1, //
// },
// },
// },
// ],
waveAnimation:true,//,
amplitude: 15, //
waveLength:150,//
shape: "circle", //'circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow'
direction: "right", //'left', 'right', 'top', 'bottom',
radius: "60%", // 50%
// color:['#1E90FF','#191970','#000080','#6495ED','#0000FF'] ,//
color:['#156ACF'] ,//
center:['50%','50%'],//1E90FF
// animationEasing:'linear',
animationEasing:'easeOut',
outline: {
borderDistance: 4, //
itemStyle: {
borderWidth: 2, //
borderColor: "#156ACF", //
},
},
// //
// itemStyle:{
// opacity:0.5, //
// color:'red', //
// shadowBlur:10, //
// shadowColor:'red', //
// shadowOffsetX:10, //
// shadowOffsetY:10, //
// },
backgroundStyle: {
color: "rgba(0,0,0,0)", //
},
label: {
normal: {
formatter: function(){
return statScore.value.aiScore + "分"
},
textStyle: {
color: "#fff",
insideColor: "#fff",
fontSize: 16,
},
},
},
},
],
};
// 使
myChart.setOption(option);
}
// //
const picUrl = ref("" as any); const picUrl = ref("" as any);
@ -208,6 +610,12 @@ const getStatScore = async (showLoading: boolean) => {
const res = await getStatScoreApi({ projectSn: store.sn }, showLoading); const res = await getStatScoreApi({ projectSn: store.sn }, showLoading);
console.log("获取项目信息6666666666666666666666666666666666", res); console.log("获取项目信息6666666666666666666666666666666666", res);
statScore.value = res.result; statScore.value = res.result;
drawAqWater()
drawWdWater()
drawJyWater()
drawFxWater()
drawZnWater()
}; };
function boxStyle(item: any) { function boxStyle(item: any) {

View File

@ -569,6 +569,8 @@ function jumpBgd() {
window.location.replace("http://182.90.224.237:15551/#/login?token=" + store.token); window.location.replace("http://182.90.224.237:15551/#/login?token=" + store.token);
}else if(COMPANY === "agjt"){ }else if(COMPANY === "agjt"){
window.location.replace(BASEURL + "/#/login?token=" + store.token); window.location.replace(BASEURL + "/#/login?token=" + store.token);
}else if(COMPANY === "zkax"){
window.location.replace("http://8.136.222.164:8809/#/login?token=" + store.token);
} else { } else {
// () // ()
window.location.replace("http://101.43.164.214:11111/#/login?token=" + store.token); window.location.replace("http://101.43.164.214:11111/#/login?token=" + store.token);

View File

@ -578,6 +578,8 @@ function jumpBgd() {
window.location.replace("http://182.90.224.237:15551/#/login?token=" + store.token); window.location.replace("http://182.90.224.237:15551/#/login?token=" + store.token);
}else if(COMPANY === "agjt"){ }else if(COMPANY === "agjt"){
window.location.replace(BASEURL + "/#/login?token=" + store.token); window.location.replace(BASEURL + "/#/login?token=" + store.token);
}else if(COMPANY === "zkax"){
window.location.replace("http://8.136.222.164:8809/#/login?token=" + store.token);
} else { } else {
// () // ()
window.location.replace("http://101.43.164.214:11111/#/login?token=" + store.token); window.location.replace("http://101.43.164.214:11111/#/login?token=" + store.token);