From cf6b67bf5a0480b9cc3383a8fbd103c868e7eafb Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 15 Mar 2025 00:12:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=9A=90=E6=82=A3?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../public/css/largeScreenStyle.css | 1 + yanzhu-bigscreen/src/views/safetyCheck.vue | 342 +++++++++++++++++- .../trouble/problemmodify/detailDrawer.vue | 4 +- .../src/views/trouble/problemmodify/index.vue | 4 +- 4 files changed, 338 insertions(+), 13 deletions(-) diff --git a/yanzhu-bigscreen/public/css/largeScreenStyle.css b/yanzhu-bigscreen/public/css/largeScreenStyle.css index aedda8a4..780881ef 100644 --- a/yanzhu-bigscreen/public/css/largeScreenStyle.css +++ b/yanzhu-bigscreen/public/css/largeScreenStyle.css @@ -60,6 +60,7 @@ body { height: 1080px; } .img-openwin { + cursor: pointer; width: 26px; height: 26px; } diff --git a/yanzhu-bigscreen/src/views/safetyCheck.vue b/yanzhu-bigscreen/src/views/safetyCheck.vue index 187685f0..002004cd 100644 --- a/yanzhu-bigscreen/src/views/safetyCheck.vue +++ b/yanzhu-bigscreen/src/views/safetyCheck.vue @@ -21,6 +21,7 @@ +
{{ item1Data.total }}
@@ -28,26 +29,237 @@
+ :render="o => renderDataItem(1)"> +
+
+
+ {{ it.name }} + + {{ it.value }} + {{ it.percent }}% +
+
+
+
+
最新提交
+
+
+ +
+
+ 提交人: + {{ it.createUser }} +
+
+ 整改人: + {{ it.lordSentUser }} +
+
+ 复检人: + {{ it.recheckSendUser }} +
+
+ 隐患描述: + {{ it.workParts }} +
+
+ 整改要求: + {{ it.changeInfo }} +
+
+ 状态: + {{ getStatus(it.checkState) }} +
+
+
- {{ item1Data.infos }}
+ - + + +
+
+
{{ item2Data.total }}
+ 问题总数 +
+
+ +
+
+
+ {{ it.name }} + + {{ it.value }} + {{ it.percent }}% +
+
+ +
+
+
最新提交
+
+
+ +
+
+ 提交人: + {{ it.createUser }} +
+
+ 整改人: + {{ it.lordSentUser }} +
+
+ 复检人: + {{ it.recheckSendUser }} +
+
+ 隐患描述: + {{ it.workParts }} +
+
+ 整改要求: + {{ it.changeInfo }} +
+
+ 状态: + {{ getStatus(it.checkState) }} +
+
+
+
+
+ - + + +
+
+
{{ item3Data.total }}
+ 问题总数 +
+
+ +
+
+
+ {{ it.name }} + + {{ it.value }} + {{ it.percent }}% +
+
+ +
+
+
最新提交
+
+
+ +
+
+ 提交人: + {{ it.createUser }} +
+
+ 整改人: + {{ it.lordSentUser }} +
+
+ 复检人: + {{ it.recheckSendUser }} +
+
+ 隐患描述: + {{ it.workParts }} +
+
+ 整改要求: + {{ it.changeInfo }} +
+
+ 状态: + {{ getStatus(it.checkState) }} +
+
+
+
+
+ - + + +
+
+
{{ item4Data.total }}
+ 问题总数 +
+
+ +
+
+
+ {{ it.name }} + + {{ it.value }} + {{ it.percent }}% +
+
+ +
+
+
最新提交
+
+
+ +
+
+ 提交人: + {{ it.createUser }} +
+
+ 整改人: + {{ it.lordSentUser }} +
+
+ 复检人: + {{ it.recheckSendUser }} +
+
+ 隐患描述: + {{ it.workParts }} +
+
+ 整改要求: + {{ it.changeInfo }} +
+
+ 状态: + {{ getStatus(it.checkState) }} +
+
+
+
+
+ @@ -85,21 +297,25 @@ export default { total: 0, datas: [], infos: [], + items: [], }, item2Data: { total: 0, datas: [], infos: [], + items: [], }, item3Data: { total: 0, datas: [], infos: [], + items: [], }, item4Data: { total: 0, datas: [], infos: [], + items: [], } } }, @@ -161,9 +377,13 @@ export default { this.showChart1();//安全隐患排查 this.showChart2();//隐患类别统计 this.makeItemData(this.item1Data, res[2].data) + this.item1Data.items = res[3].rows; this.makeItemData(this.item2Data, res[4].data) + this.item2Data.items = res[5].rows; this.makeItemData(this.item3Data, res[6].data) + this.item3Data.items = res[7].rows; this.makeItemData(this.item4Data, res[8].data) + this.item4Data.items = res[9].rows; this.itemChartKey1++; }); }, @@ -173,6 +393,13 @@ export default { showChart2() { this.chartKey2++; }, + getStatus(s) { + let checkStates = [{ value: "0", label: '待整改' }, { value: "1", label: '待复检' }, + { value: "3", label: '复检驳回' }, + { value: "4", label: '复检通过' }]; + let objs = checkStates.filter(it => it.value == s); + return objs.length > 0 ? objs[0].label : ''; + }, makeItemData(item, res) { let labels = ['问题总数', '待整改', '待复检', '复检驳回', '整改完成', '超时整改']; item.total = res[0].id; @@ -189,11 +416,13 @@ export default { item.infos.push({ name: labels[i], value: res[i].id, + type: res[i].projectName, percent: total == 0 ? 0 : (res[i].id / total * 100.0).toFixed(1) }); } }, - renderDataItem1() { + renderDataItem(n) { + let objs = this._data['item' + n + 'Data']; let option = { color: ["#71BCC4", "#EEBE47", "#5EA85D", "#5B84EB", "#E76168"], series: [ @@ -216,11 +445,10 @@ export default { labelLine: { show: false }, - data: this.item1Data.datas + data: objs.datas } ] }; - console.log("--->", this.item1Data.datas) return option; }, renderChart2(opt) { @@ -405,7 +633,8 @@ export default { height: 230px; width: 230px; display: inline-block; - position: relative; + position: absolute; + left: -30px; .total-info { position: absolute; @@ -430,6 +659,101 @@ export default { } } + .div-item-info { + display: inline-block; + width: calc(100% - 180px); + right: -0px; + top: 20px; + position: absolute; + + .item-info { + line-height: 30px; + + .sp-lend { + display: inline-block; + margin-left: 8px; + width: 10px; + height: 20px; + position: relative; + top: 4px; + + &.is-b { + background-color: #71BCC4; + } + + &.is-c { + background-color: #EEBE47; + } + + &.is-d { + background-color: #5EA85D; + } + + &.is-e { + background-color: #5B84EB; + } + } + + .sp-name { + display: inline-block; + text-align: right; + width: 70px; + } + + .sp-value { + margin-left: 8px; + font-size: 24px; + display: inline-block; + text-align: center; + min-width: 70px; + } + + .sp-percent { + margin-left: 8px; + color: #5B84EB; + } + } + } + } + + .div-item-data { + height: calc(100% - 230px); + + .div-item-list { + height: calc(100% - 20px); + overflow-y: auto; + + .list-item { + display: flex; + margin-top: 10px; + border-top: solid 1px #ccc; + padding-top: 10px; + + &:first-child { + margin-top: 0px; + border-top: none; + } + + .img-sm { + width: calc(100% - 200px); + height: 120px; + } + + .list-item-info { + width: 200px; + font-size: 12px; + padding-left: 10px; + + .item-row { + line-height: 24px; + + .sp-label { + color: #8BFFD2; + } + } + } + } + } } @media (min-width: 1921px) and (max-width: 2560px) { diff --git a/yanzhu-ui-vue3/src/views/trouble/problemmodify/detailDrawer.vue b/yanzhu-ui-vue3/src/views/trouble/problemmodify/detailDrawer.vue index 6cebd9dd..7831a5f1 100644 --- a/yanzhu-ui-vue3/src/views/trouble/problemmodify/detailDrawer.vue +++ b/yanzhu-ui-vue3/src/views/trouble/problemmodify/detailDrawer.vue @@ -253,8 +253,8 @@ let data = reactive({ ] }, checkStates: [{ value: "0", label: '待整改' }, { value: "1", label: '待复检' }, - { value: "2", label: '复检驳回' }, - { value: "3", label: '复检通过' }] + { value: "3", label: '复检驳回' }, + { value: "4", label: '复检通过' }] }); const { step2Form, step2Rules, step3Form, step3Rules } = toRefs(data); function validateStep2Images(rule, value, callback) { diff --git a/yanzhu-ui-vue3/src/views/trouble/problemmodify/index.vue b/yanzhu-ui-vue3/src/views/trouble/problemmodify/index.vue index 44cc0918..a65f70db 100644 --- a/yanzhu-ui-vue3/src/views/trouble/problemmodify/index.vue +++ b/yanzhu-ui-vue3/src/views/trouble/problemmodify/index.vue @@ -130,8 +130,8 @@ const data = reactive({ activeName: 'a', tabInfo: {}, checkStates: [{ value: "0", label: '待整改' }, { value: "1", label: '待复检' }, - { value: "2", label: '复检驳回' }, - { value: "3", label: '复检通过' }] + { value: "3", label: '复检驳回' }, + { value: "4", label: '复检通过' }] }); const { queryParams, form, rules } = toRefs(data); From b22316d993c16fd192dc284a42f741396b57d413 Mon Sep 17 00:00:00 2001 From: haha Date: Sun, 16 Mar 2025 21:47:17 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=9A=90=E6=82=A3?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yanzhu-bigscreen/src/api/safety.js | 2 - .../src/views/safety/safetyCheckDialog.vue | 293 ++++++++++++++++++ yanzhu-bigscreen/src/views/safetyCheck.vue | 236 +++++++++++++- .../trouble/SmzSspProblemmodifyMapper.xml | 6 + 4 files changed, 521 insertions(+), 16 deletions(-) create mode 100644 yanzhu-bigscreen/src/views/safety/safetyCheckDialog.vue diff --git a/yanzhu-bigscreen/src/api/safety.js b/yanzhu-bigscreen/src/api/safety.js index 603ddabe..0fbc4918 100644 --- a/yanzhu-bigscreen/src/api/safety.js +++ b/yanzhu-bigscreen/src/api/safety.js @@ -25,8 +25,6 @@ const listCountForBG = (data) => { }; const listForBG = (data) => { - data.pageSize = 5; - data.pageNum = 1; return request({ url: `/manage/problemmodify/listForBG`, method: "get", diff --git a/yanzhu-bigscreen/src/views/safety/safetyCheckDialog.vue b/yanzhu-bigscreen/src/views/safety/safetyCheckDialog.vue new file mode 100644 index 00000000..afda7920 --- /dev/null +++ b/yanzhu-bigscreen/src/views/safety/safetyCheckDialog.vue @@ -0,0 +1,293 @@ + + + + + \ No newline at end of file diff --git a/yanzhu-bigscreen/src/views/safetyCheck.vue b/yanzhu-bigscreen/src/views/safetyCheck.vue index 002004cd..1aa41cec 100644 --- a/yanzhu-bigscreen/src/views/safetyCheck.vue +++ b/yanzhu-bigscreen/src/views/safetyCheck.vue @@ -21,7 +21,7 @@ - +
{{ item1Data.total }}
@@ -79,14 +79,14 @@ - + - +
{{ item2Data.total }}
@@ -145,7 +145,7 @@ - +
{{ item3Data.total }}
@@ -204,7 +204,7 @@ - +
{{ item4Data.total }}
@@ -263,13 +263,19 @@ +
+ + \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue new file mode 100644 index 00000000..02a637de --- /dev/null +++ b/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/device/towerDataLocal/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataLocal/index.vue new file mode 100644 index 00000000..5728a514 --- /dev/null +++ b/yanzhu-ui-vue3/src/views/device/towerDataLocal/index.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue new file mode 100644 index 00000000..5a728fc3 --- /dev/null +++ b/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue new file mode 100644 index 00000000..7b87fdd1 --- /dev/null +++ b/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/device/towerDataWarning/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataWarning/index.vue new file mode 100644 index 00000000..6b9baad4 --- /dev/null +++ b/yanzhu-ui-vue3/src/views/device/towerDataWarning/index.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue b/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue new file mode 100644 index 00000000..53efc084 --- /dev/null +++ b/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue @@ -0,0 +1,481 @@ + + + + + \ No newline at end of file From c9432db4520d4c825cc1d760c00b9aea939a32c5 Mon Sep 17 00:00:00 2001 From: haha Date: Wed, 19 Mar 2025 23:10:37 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A1=94=E6=9C=BA=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yanzhu/device/domain/DevTowerDataRun.java | 6 +- .../device/domain/DevTowerProjectConfig.java | 8 +- yanzhu-ui-vue3/src/api/device/towerDataRun.js | 44 ++ .../src/layout/components/AppMain.vue | 9 +- .../layout/components/IframeToggle/index.vue | 11 +- .../src/views/device/towerDataRun/index.vue | 423 +++++++++++++++++- .../views/device/towerProjectConfig/index.vue | 31 +- 7 files changed, 485 insertions(+), 47 deletions(-) create mode 100644 yanzhu-ui-vue3/src/api/device/towerDataRun.js diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataRun.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataRun.java index 94706d0e..0614f1f0 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataRun.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataRun.java @@ -23,6 +23,9 @@ public class DevTowerDataRun extends BaseEntity /** 项目主键 */ private Long projectId; + /** 租户名称 */ + @Excel(name = "租户名称") + private String comName; /** 项目名称 */ @Excel(name = "项目名称") @@ -31,9 +34,6 @@ public class DevTowerDataRun extends BaseEntity /** 总包单位主键 */ private Long comId; - /** 总包单位名称 */ - @Excel(name = "总包单位名称") - private String comName; /** 设备序列号 */ @Excel(name = "设备序列号") diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerProjectConfig.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerProjectConfig.java index 23569b76..38e4648a 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerProjectConfig.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerProjectConfig.java @@ -20,6 +20,10 @@ public class DevTowerProjectConfig extends BaseEntity /** 项目主键 */ private Long projectId; + /** 租户名称 */ + @Excel(name = "租户名称") + private String comName; + /** 项目名称 */ @Excel(name = "项目名称") private String projectName; @@ -27,9 +31,7 @@ public class DevTowerProjectConfig extends BaseEntity /** 总包单位主键 */ private Long comId; - /** 总包单位名称 */ - @Excel(name = "总包单位名称") - private String comName; + /** 设备序列号 */ @Excel(name = "设备序列号") diff --git a/yanzhu-ui-vue3/src/api/device/towerDataRun.js b/yanzhu-ui-vue3/src/api/device/towerDataRun.js new file mode 100644 index 00000000..b4bd5ce2 --- /dev/null +++ b/yanzhu-ui-vue3/src/api/device/towerDataRun.js @@ -0,0 +1,44 @@ +import request from "@/utils/request"; + +// 查询塔机实时数据列表 +export function listTowerDataRun(query) { + return request({ + url: "/manage/device/towerDataRun/list", + method: "get", + params: query, + }); +} + +// 查询塔机实时数据详细 +export function getTowerDataRun(id) { + return request({ + url: "/manage/device/towerDataRun/" + id, + method: "get", + }); +} + +// 新增塔机实时数据 +export function addTowerDataRun(data) { + return request({ + url: "/manage/device/towerDataRun", + method: "post", + data: data, + }); +} + +// 修改塔机实时数据 +export function updateTowerDataRun(data) { + return request({ + url: "/manage/device/towerDataRun", + method: "put", + data: data, + }); +} + +// 删除塔机实时数据 +export function delTowerDataRun(id) { + return request({ + url: "/manage/device/towerDataRun/" + id, + method: "delete", + }); +} diff --git a/yanzhu-ui-vue3/src/layout/components/AppMain.vue b/yanzhu-ui-vue3/src/layout/components/AppMain.vue index 42fffdf7..f7279b71 100644 --- a/yanzhu-ui-vue3/src/layout/components/AppMain.vue +++ b/yanzhu-ui-vue3/src/layout/components/AppMain.vue @@ -1,9 +1,9 @@