diff --git a/.env.development b/.env.development index 196ad2f..0b6ff29 100644 --- a/.env.development +++ b/.env.development @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 产发工程数字管理平台 +VUE_APP_TITLE = 长安区数字工程监管系统 # 开发环境配置 ENV = 'development' -# 产发工程数字管理平台/开发环境 +# 长安区数字工程监管系统/开发环境 VUE_APP_BASE_API = '/jhapi' # 路由懒加载 diff --git a/.env.production b/.env.production index e0a57d2..cd2e99a 100644 --- a/.env.production +++ b/.env.production @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 产发工程数字管理平台 +VUE_APP_TITLE = 长安区数字工程监管系统 # 生产环境配置 ENV = 'production' -# 产发工程数字管理平台/生产环境 +# 长安区数字工程监管系统/生产环境 VUE_APP_BASE_API = '/jhapi' diff --git a/.env.staging b/.env.staging index eda5f42..b4e2577 100644 --- a/.env.staging +++ b/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 产发工程数字管理平台 +VUE_APP_TITLE = 长安区数字工程监管系统 NODE_ENV = production # 测试环境配置 ENV = 'staging' -# 产发工程数字管理平台/测试环境 +# 长安区数字工程监管系统/测试环境 VUE_APP_BASE_API = '/stage-api' diff --git a/public/css/largeScreenStyle.css b/public/css/largeScreenStyle.css index 3f3edd6..bc1cfcd 100644 --- a/public/css/largeScreenStyle.css +++ b/public/css/largeScreenStyle.css @@ -79,13 +79,11 @@ table{ .head-title-select{ padding-top: 23px; width: 12% ; - position: relative; } .head-title-date{ - padding-top: 15px; - width: 15% ; + padding-top: 30px; + width: 290px; display: flex; - align-items: center; } .head-nav{ width: 105px; @@ -130,19 +128,32 @@ table{ .head-select input::-webkit-input-placeholder{ color: #6ca5b1; } -.header-screen-ul{ +.title-select1 .header-screen-ul{ list-style: none; - width: 90%; + width: 128px; position: absolute; max-height: 600px; border: 1px solid #05556b; - left: 5%; background: #00092a; overflow: auto; color: #02a6ff; border-radius: 3px; z-index: 99999; } + +.title-select3 .header-screen-ul{ + list-style: none; + width: 182px; + position: absolute; + max-height: 600px; + border: 1px solid #05556b; + background: #00092a; + overflow: auto; + color: #02a6ff; + border-radius: 3px; + z-index: 99999; +} + .header-screen-ul::-webkit-scrollbar { width: 10px; height: 1px; diff --git a/public/favicon.ico b/public/favicon.ico index 0908b50..6113ef8 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/index.html b/public/index.html index 72bfe50..0c560cc 100644 --- a/public/index.html +++ b/public/index.html @@ -5,7 +5,7 @@ - 产发工程数字管理平台-大屏 + 长安区数字工程监管系统-大屏 @@ -62,30 +62,5 @@ We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.
- - - diff --git a/public/newmap/index.html b/public/newmap/index.html index 10d6e77..c0aef88 100644 --- a/public/newmap/index.html +++ b/public/newmap/index.html @@ -4,7 +4,7 @@ - 产发工程数字管理平台 + 长安区数字工程监管系统 diff --git a/src/pages/safe/distributionBox.vue b/src/pages/safe/distributionBox.vue index 7fcf040..ba4aeca 100644 --- a/src/pages/safe/distributionBox.vue +++ b/src/pages/safe/distributionBox.vue @@ -7,44 +7,44 @@
- +
-
A相温度
-

{{ powerRun.t1 }} ℃

+
A相电压
+

{{ runData.voltageA }} V
- +
-
B相温度
-

{{ powerRun.t2 }} ℃

+
B相电压
+

{{ runData.voltageB }} V
- +
-
C相温度
-

{{ powerRun.t3 }} ℃

+
C相电压
+

{{ runData.voltageC }} V
- +
零线温度
-

{{ powerRun.t4 }} ℃

+

{{ runData.temperature }} ℃

 @@ -52,40 +52,40 @@
温度阈值
-

70 ℃

+

{{ powerRun.ratedTemperature }} ℃

- +
A相电流
-

{{ powerRun.c1 }} A

+

{{ runData.currentA }} A
- +
B相电流
-

{{ powerRun.c2 }} A

+

{{ runData.currentB }} A
- +
C相电流
-

{{ powerRun.c3 }} A

+

{{ runData.currentC }} A

 @@ -93,17 +93,39 @@
-
近7天
-
近30天
+
+ 近7天 +
+
+ 近30天 +
- +
-
近7天
-
近30天
+
+ 近7天 +
+
+ 近30天 +
- + @@ -120,40 +142,50 @@
- + + +
-
在线
+
+ 在线 +
离线
- 名称： + 电箱等级： -
{{ lastChooseDevice.deviceId }}
+
+ {{ powerRun.levels }} 级配电箱 +
- 安装位置： - 办公区 + 额定电流： + {{ powerRun.ratedCurrent }} - 设备状态： - -
无警告/在线
-
离线
- - + 额定电压： + {{ powerRun.ratedVoltage }} - 设备编码： - {{ lastChooseDevice.deviceId }} + 联系人： + {{ powerRun.contactPerson }} - 更新时间： - {{ powerRun.time }} + 联系电话： + {{ powerRun.contactPersonPhone }} @@ -163,111 +195,226 @@
正在发生
-
-
暂无预警数据
-
-
{{ item.type }}
+
+
+ 暂无预警数据 +
+
+
{{ item.warningType }}
-
- -
-
{{ item.content }}
-
{{ item.time }}
+
+ {{ item.warningContent }} +
+
+ {{ item.createTime }} +
-
异常传感器：传感器-{{ - item.deviceId }} -
- - diff --git a/src/pages/safe/towerCrane.vue b/src/pages/safe/towerCrane.vue index 46aa770..ee5cb72 100644 --- a/src/pages/safe/towerCrane.vue +++ b/src/pages/safe/towerCrane.vue @@ -296,36 +296,26 @@
塔机监测
-
+
暂无预警数据
- +
- - - - - - + + + +
@@ -336,6 +326,7 @@
@@ -487,16 +478,19 @@
-
+
- 报警:{{ it.data1 }} - 报警:{{ it.data2 }} + 报警:{{ it.data2 }} - {{ it.scale2 }} + 当前:{{ it.data1 }}
@@ -522,6 +516,7 @@ export default { data() { return { index: 0, + itemChartKey1: 0, towerConfigView: [], towerConfigList: [], towerConfigStat: { a0: 0, b0: 0, c0: 0, a1: 0, b1: 0, c1: 0 }, @@ -550,7 +545,6 @@ export default { direction: "right", comName: "tower-crane-value-1", warningData: [], - momentData: {}, forIndex: 0, warningInterval: undefined, countvwInterval: undefined, @@ -559,116 +553,108 @@ export default { prjs: [], project: null, dicts: [], + momentData: { + dataX: [15, 20, 25, 30, 35, 40, 45, 50, 55, 60], + dataY: [3, 3, 3, 3, 2.59, 2.2, 1.9, 1.66, 1.46, 1.3], + }, }; }, + computed: { + reversedList() { + return Array.from({ length: 10 }, (_, i) => i + 1).reverse(); + }, + }, created() { this.$api.dict("device_tower_warning").then((d) => { this.dicts = d || []; }); + this.initMe(); }, + mounted() { - this.momentData = JSON.parse( - '{"point":[[null,null]],"dataX":[15,20,25,30,35,40,45,50,55,60],"dataY":[3,3,3,3,2.59,2.2,1.9,1.66,1.46,1.3]}' - ); this.$bus.$on( "projectChange", debounce((res) => { - this.project = res || this.$root.project; - this.dept = this.$root.dept || this.dept; - this.prjs = this.$root.projects || this.prjs; - this.index = 0; - this.initMe(); + this.project = res; + this.init(); }) ); - this.initMe(); + if (this.$root.hasInitHeader) { + this.initMe(); + } }, methods: { initMe() { + this.project = this.$root.project; + this.init(); + }, + init() { this.initTowerConfigView(); this.initTowerConfigList(); }, - getProjectId(cb) { - let func = () => { - let prjId = this.project?.id || 0; - if (prjId == 0) { - if (!this.prjs || this.prjs.length == 0) { - setTimeout(func, 100); - } else { - if (this.prjs.length > 1) { - cb && cb(this.prjs[1].id); - } else { - cb(0); - } - } - } else { - cb && cb(prjId); - } - }; - func(); - }, initTowerConfigView() { - this.getProjectId((id) => { - this.$api.tower.findTowerConfigGroupOnline(null, id).then((d) => { - let list = []; - let total = 0; - if (d.data && d.data.length > 0) { - d.data.forEach((datum) => { - total += datum.total; - if (datum.online == 1) { - list.push({ text: "在线数量", value: datum.total }); - if (d.data.length == 1) { - list.push({ text: "离线数量", value: 0 }); - } - } else { - list.push({ text: "离线数量", value: datum.total }); + this.$api.tower.findTowerConfigGroupOnline(this.project.id).then((d) => { + let list = []; + let total = 0; + if (d.data && d.data.length > 0) { + d.data.forEach((datum) => { + total += datum.total; + if (datum.online == 1) { + list.push({ text: "在线数量", value: datum.total }); + if (d.data.length == 1) { + list.push({ text: "离线数量", value: 0 }); } - }); - } - this.towerTotalNum = total; - this.towerConfigView = list; - }); + } else { + list.push({ text: "离线数量", value: datum.total }); + } + }); + } + this.towerTotalNum = total; + this.towerConfigView = list; }); }, initTowerConfigList() { - this.getProjectId((id) => { - this.$api.tower.findTowerConfigListByProjectId(null, id).then((d) => { - this.towerConfigList = d.data || []; - if (d.data.length > 0) { - this.initSelDev(this.index); - }else{ - this.runData.height = "0"; - this.runData.range = "0"; - this.runData.rotation = "0"; - this.runData.load = "0"; - this.runData.windSpeed = "0"; - this.runData.leanAngleX = "0"; - this.runData.leanAngleY = "0"; - this.runData.loadPercent = "0"; - this.runData.momentPercent = "0"; - this.runData.windSpeedPercent = "0"; - this.runData.warnings = null; - this.devBottomInfo[0].data1 = 0; - this.devBottomInfo[1].data1 = 0; - this.devBottomInfo[2].data1 = 0; - this.devBottomInfo[3].data1 = 0; - this.devBottomInfo[4].data1 = 0; - this.devBottomInfo[5].data1 = 0; - this.devBottomInfo[0].data2 = 0; - this.devBottomInfo[1].data2 = 0; - this.devBottomInfo[2].data2 = 0; - this.devBottomInfo[3].data2 = 0; - this.devBottomInfo[4].data2 = 0; - this.devBottomInfo[5].data2 = 0; - this.towerConfigStat.a0 = 0; - this.towerConfigStat.b0 = 0; - this.towerConfigStat.c0 = 0; - this.towerConfigStat.a1 = 0; - this.towerConfigStat.b1 = 0; - this.towerConfigStat.c1 = 0; - this.warningData = []; - this.selDev = {deviceName:"未找到设备",frontBrachium:0,afterBrachium:0}; - } - }); + this.$api.tower.findTowerConfigListByProjectId(this.project.id).then((d) => { + this.towerConfigList = d.data || []; + if (d.data.length > 0) { + this.initSelDev(this.index); + } else { + this.runData.height = "0"; + this.runData.range = "0"; + this.runData.rotation = "0"; + this.runData.load = "0"; + this.runData.windSpeed = "0"; + this.runData.leanAngleX = "0"; + this.runData.leanAngleY = "0"; + this.runData.loadPercent = "0"; + this.runData.momentPercent = "0"; + this.runData.windSpeedPercent = "0"; + this.runData.warnings = null; + this.devBottomInfo[0].data1 = 0; + this.devBottomInfo[1].data1 = 0; + this.devBottomInfo[2].data1 = 0; + this.devBottomInfo[3].data1 = 0; + this.devBottomInfo[4].data1 = 0; + this.devBottomInfo[5].data1 = 0; + this.devBottomInfo[0].data2 = 0; + this.devBottomInfo[1].data2 = 0; + this.devBottomInfo[2].data2 = 0; + this.devBottomInfo[3].data2 = 0; + this.devBottomInfo[4].data2 = 0; + this.devBottomInfo[5].data2 = 0; + this.towerConfigStat.a0 = 0; + this.towerConfigStat.b0 = 0; + this.towerConfigStat.c0 = 0; + this.towerConfigStat.a1 = 0; + this.towerConfigStat.b1 = 0; + this.towerConfigStat.c1 = 0; + this.warningData = []; + this.selDev = { + deviceName: "未找到设备", + frontBrachium: 0, + afterBrachium: 0, + }; + } }); }, initCountData() { @@ -700,21 +686,64 @@ export default { this.runData.momentPercent = d.data[0].momentPercent; this.runData.windSpeedPercent = d.data[0].windSpeedPercent; this.runData.warnings = d.data[0].warnings; - this.devBottomInfo[0].data1 = d.data[0].range; - this.devBottomInfo[1].data1 = d.data[0].windSpeed; - this.devBottomInfo[2].data1 = d.data[0].load; - this.devBottomInfo[3].data1 = d.data[0].leanAnglePercent - ? d.data[0].leanAnglePercent - : 0; - this.devBottomInfo[4].data1 = d.data[0].rotation; - this.devBottomInfo[5].data1 = d.data[0].height; + this.devBottomInfo[0].data1 = d.data[0].range || 0; + this.devBottomInfo[1].data1 = d.data[0].windSpeed || 0; + this.devBottomInfo[2].data1 = d.data[0].load || 0; + this.devBottomInfo[3].data1 = d.data[0].leanAnglePercent || 0; + this.devBottomInfo[4].data1 = d.data[0].rotation || 0; + this.devBottomInfo[5].data1 = d.data[0].height || 0; + if (this.devBottomInfo[0].data1 > 0 && this.devBottomInfo[0].data2 > 0) { + this.devBottomInfo[0].scale1 = Math.round( + (this.devBottomInfo[0].data1 / this.devBottomInfo[0].data2) * 10 + ); + } + if (this.devBottomInfo[1].data1 > 0 && this.devBottomInfo[1].data2 > 0) { + this.devBottomInfo[1].scale1 = Math.round( + (this.devBottomInfo[1].data1 / this.devBottomInfo[1].data2) * 10 + ); + } + if (this.devBottomInfo[2].data1 > 0 && this.devBottomInfo[2].data2 > 0) { + this.devBottomInfo[2].scale1 = Math.round( + (this.devBottomInfo[2].data1 / this.devBottomInfo[2].data2) * 10 + ); + } + if (this.devBottomInfo[3].data1 > 0 && this.devBottomInfo[3].data2 > 0) { + this.devBottomInfo[3].scale1 = Math.round( + (this.devBottomInfo[3].data1 / this.devBottomInfo[3].data2) * 10 + ); + } + if (this.devBottomInfo[4].data1 > 0 && this.devBottomInfo[4].data2 > 0) { + this.devBottomInfo[4].scale1 = Math.round( + (this.devBottomInfo[4].data1 / this.devBottomInfo[4].data2) * 10 + ); + } + if (this.devBottomInfo[5].data1 > 0 && this.devBottomInfo[5].data2 > 0) { + this.devBottomInfo[5].scale1 = Math.round( + (this.devBottomInfo[5].data1 / this.devBottomInfo[5].data2) * 10 + ); + } + let _dataX = []; + let _dataY = []; + let _dataList = [...d.data].reverse(); + _dataList.forEach((item) => { + _dataX.push(item.range); + _dataY.push(item.load); + }); + this.momentData.dataX = _dataX; + this.momentData.dataY = _dataY; + this.itemChartKey1++; } - this.warningData = d.data || []; }); + // 查询塔机预警数据 + this.$api.tower + .findDevTowerDataWarningDatas({ deviceKey: this.selDev.deviceSn }) + .then((d) => { + this.warningData = d.data || []; + }); }, calcTop(d) { - let tmp = 100 - (d.data2 * 100.0) / d.data1; - return `top:calc(20px + ${tmp > 78 ? 78 : tmp}%)`; + let tmp = d.scale1 * 16; + return `top:calc(222px - ${tmp}px)`; }, getRoudValue(a, b) { if (a > 0) { @@ -757,10 +786,10 @@ export default { this.initRunData(); //正在发生 定时器 clearInterval(this.warningInterval); - this.warningInterval = setInterval(this.initRunData, 60000); + this.warningInterval = setInterval(this.initRunData, 30000); this.initCountData(); clearInterval(this.countvwInterval); - this.countvwInterval = setInterval(this.initCountData, 60000); + this.countvwInterval = setInterval(this.initCountData, 30000); }, onTowerCraneList(n) { this.index = n; @@ -786,13 +815,13 @@ export default { warningListMinMouseout() { this.warningInterval = setInterval(this.safeAutomaticRoll, 10000); }, - dic(ds,value){ - if(value.split(",").indexOf(ds)>-1){ + dic(ds, value) { + if (value.split(",").indexOf(ds) > -1) { return true; - }else{ - return false + } else { + return false; } - } + }, }, }; @@ -969,6 +998,12 @@ export default { background: #002d8d94; border-radius: 5%; } + .scale-item-ac { + margin: 22% 0px; + height: 4%; + background: #6632fdde; + border-radius: 5%; + } } .sp-sc { diff --git a/src/pages/toAIVideoProject.vue b/src/pages/toAIVideoProject.vue index 30fef86..99f0313 100644 --- a/src/pages/toAIVideoProject.vue +++ b/src/pages/toAIVideoProject.vue @@ -3,19 +3,13 @@
- -
- + - - -
+ :text="overviewTextDay" :height="250"> - -
+ + + @@ -326,7 +322,7 @@ export default { groupCountByProject() { this.$api.aiBoxVideo //.groupCountByProject(this.dept?.id || 0, this.projectInfo?.id) - .groupCountByProject( 0, null) + .groupCountByProject( 0, this.projectInfo?.id) .then((d) => { let sum = 0; let tmps = (d.data || []).map((it, idx) => { @@ -353,7 +349,7 @@ export default { sum += datum.value; }); this.overviewTotalDay = sum; - this.typeDistributionDataDay = response.data; + this.typeDistributionDataDay = response.data.filter(detail=>detail.value>0); this.overviewDay++; } }); @@ -379,10 +375,6 @@ export default {