From e92fd99252873021d8e412f304f794d7311c1073 Mon Sep 17 00:00:00 2001
From: fangjiakai <450850793@qq.com>
Date: Wed, 28 Feb 2024 08:41:42 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=BD=A8=E8=BF=B9?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A1=E7=AE=97=E7=A7=BB=E5=8A=A8=E9=80=9F?=
=?UTF-8?q?=E5=BA=A6=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/lib/Cesium/CustomCesium.js | 8 +++--
.../historical_trajectory_options.vue | 6 ++--
src/views/BI/components/rightico.vue | 3 +-
src/views/BI/js/history_trajectory.js | 6 ++--
src/views/BI/js/map.js | 11 ++++---
src/views/BI/js/trajectory.js | 31 ++++++++++++++-----
.../information/edit.vue | 14 ++++-----
7 files changed, 52 insertions(+), 27 deletions(-)
diff --git a/public/lib/Cesium/CustomCesium.js b/public/lib/Cesium/CustomCesium.js
index 87bfe83..d45d1fb 100644
--- a/public/lib/Cesium/CustomCesium.js
+++ b/public/lib/Cesium/CustomCesium.js
@@ -697,7 +697,9 @@ var CustomCesium;
l = new S.Tween({x: a._value.x, y: a._value.y, z: a._value.z});
l.to({x: o.x, y: o.y, z: o.z}, n), l.onUpdate((({x: e, y: t, z: i}) => {
let n = new Cesium.Cartesian3(e, t, i);
- this.entity.position = n;
+ if(this.entity){
+ this.entity.position = n;
+ }
let a = r.Cartesian3ToWGS84(this.icy.viewer, n);
s(a)
})), l.start()
@@ -1387,7 +1389,9 @@ var CustomCesium;
a = new S.Tween({x: n._value.x, y: n._value.y, z: n._value.z});
a.to({x: s.x, y: s.y, z: s.z}, r), a.onUpdate((({x: e, y: t, z: i}) => {
let r = new Cesium.Cartesian3(e, t, i);
- this.entity.position = r
+ if(this.entity){
+ this.entity.position = r;
+ }
})), a.start()
}
diff --git a/src/views/BI/components/historical_trajectory_options.vue b/src/views/BI/components/historical_trajectory_options.vue
index cdde126..2dfbd92 100644
--- a/src/views/BI/components/historical_trajectory_options.vue
+++ b/src/views/BI/components/historical_trajectory_options.vue
@@ -129,7 +129,8 @@ const {
currentData[0],
currentData[1]
)
- : undefined
+ : undefined,
+ 1000 / data.speed
);
},
});
@@ -156,10 +157,10 @@ const fnGetData = async () => {
ElMessage.warning("请选择时间");
return;
}
- hadleDestroy();
data.positions = [];
pause();
reset();
+ hadleDestroy();
await getTrajectoriesData(
data.searchForm.personnel,
data.searchForm.dates[0],
@@ -210,6 +211,7 @@ const fnPause = () => {
onBeforeUnmount(() => {
console.log("onBeforeUnmount");
+ pause();
hadleDestroy();
});
diff --git a/src/views/BI/components/rightico.vue b/src/views/BI/components/rightico.vue
index 1b12376..5e15b17 100644
--- a/src/views/BI/components/rightico.vue
+++ b/src/views/BI/components/rightico.vue
@@ -16,7 +16,7 @@
diff --git a/src/views/aggregation_management/gathering_alarm_records/index.vue b/src/views/aggregation_management/gathering_alarm_records/index.vue
index e8a1061..9afcd4b 100644
--- a/src/views/aggregation_management/gathering_alarm_records/index.vue
+++ b/src/views/aggregation_management/gathering_alarm_records/index.vue
@@ -34,30 +34,56 @@
{{ serialNumber(pagination, $index) }}
-
-
-
-
+
+
+ {{ row.status === "1" ? "已处理" : "待处理" }}
+
+
+
+
+
- {{ row }}
+ 查看详情
+
diff --git a/src/views/risk_control/identifying_parts/index.vue b/src/views/risk_control/identifying_parts/index.vue
index 13f1a2b..36ae34d 100644
--- a/src/views/risk_control/identifying_parts/index.vue
+++ b/src/views/risk_control/identifying_parts/index.vue
@@ -148,11 +148,9 @@ import { ElMessage, ElMessageBox } from "element-plus";
import { nextTick, reactive } from "vue";
import LayoutImportFile from "@/components/import_file/index.vue";
import Add from "./components/add.vue";
-// import { useRouter } from "vue-router";
import QrCode from "./components/qr_code.vue";
import LayoutTooltipImg from "@/components/tooltip_img/index.vue";
import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
-// const router = useRouter();
const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
useListData(getIdentifyingPartsList);
const data = reactive({
From f0590c087c7e0e9e95e058d772a6cf832b76d4e7 Mon Sep 17 00:00:00 2001
From: LiuJiaNan
Date: Wed, 28 Feb 2024 10:15:13 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8Decharts=E8=AD=A6?=
=?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/BI/components/personnel.vue | 39 +------------------
src/views/BI/js/echarts1.js | 16 +++-----
src/views/BI/js/echarts2.js | 10 ++---
src/views/BI/js/echarts4.js | 20 ++++------
src/views/BI/js/echarts5.js | 10 ++---
.../components/full_staff_training.vue | 8 ----
.../components/hidden_danger_situation.vue | 8 +---
7 files changed, 22 insertions(+), 89 deletions(-)
diff --git a/src/views/BI/components/personnel.vue b/src/views/BI/components/personnel.vue
index 8e715ad..5b36d8f 100644
--- a/src/views/BI/components/personnel.vue
+++ b/src/views/BI/components/personnel.vue
@@ -76,44 +76,7 @@ const data = reactive({
},
],
eleType: 0,
- block2OptionsList: [
- {
- label: "滞留报警",
- count: 0,
- },
- {
- label: "越界报警",
- count: 235,
- },
- {
- label: "超员报警",
- count: 569,
- },
- {
- label: "缺员报警",
- count: 569,
- },
- {
- label: "静止报警",
- count: 423,
- },
- {
- label: "串岗报警",
- count: 789,
- },
- {
- label: "一键告警",
- count: 236,
- },
- {
- label: "聚集告警",
- count: 214,
- },
- {
- label: "作业告警",
- count: 852,
- },
- ],
+ block2OptionsList: [],
block3List: [
{
name: "赵一诺",
diff --git a/src/views/BI/js/echarts1.js b/src/views/BI/js/echarts1.js
index e1aab14..4b18c12 100644
--- a/src/views/BI/js/echarts1.js
+++ b/src/views/BI/js/echarts1.js
@@ -57,10 +57,8 @@ function echarts1(id, legend, echartCount) {
type: "shadow",
},
axisLabel: {
- textStyle: {
- color: "#B3CFFF", // x轴文本颜色
- fontSize: 10,
- },
+ color: "#B3CFFF", // x轴文本颜色
+ fontSize: 10,
formatter(params) {
// const res = xWrapText(params, 6);
xWrapText(params, 6);
@@ -84,10 +82,8 @@ function echarts1(id, legend, echartCount) {
},
axisLabel: {
formatter: "{value}%",
- textStyle: {
- color: "#B3CFFF", // x轴文本颜色
- fontSize: 12,
- },
+ color: "#B3CFFF", // x轴文本颜色
+ fontSize: 12,
},
name: "",
nameTextStyle: {
@@ -119,7 +115,7 @@ function echarts1(id, legend, echartCount) {
opacity: 1,
},
]),
- barBorderRadius: [0, 0, 0, 0],
+ borderRadius: [0, 0, 0, 0],
},
data: echartCount,
},
@@ -148,7 +144,7 @@ function echarts1(id, legend, echartCount) {
opacity: 1,
},
]),
- barBorderRadius: [0, 0, 0, 0],
+ borderRadius: [0, 0, 0, 0],
},
data: echartCount,
barGap: 0,
diff --git a/src/views/BI/js/echarts2.js b/src/views/BI/js/echarts2.js
index 4b74fe2..4b6dede 100644
--- a/src/views/BI/js/echarts2.js
+++ b/src/views/BI/js/echarts2.js
@@ -34,10 +34,8 @@ function echarts2(id, month, accumulated, currentMonth) {
},
axisLabel: {
// 坐标轴刻度标签的相关设置
- textStyle: {
- color: "#d1e6eb",
- margin: 15,
- },
+ color: "#d1e6eb",
+ margin: 15,
interval: 0,
rotate: 30,
},
@@ -64,9 +62,7 @@ function echarts2(id, month, accumulated, currentMonth) {
},
axisLabel: {
margin: 20,
- textStyle: {
- color: "#d1e6eb",
- },
+ color: "#d1e6eb",
},
axisTick: {
show: false,
diff --git a/src/views/BI/js/echarts4.js b/src/views/BI/js/echarts4.js
index f5aa0ea..fd607a1 100644
--- a/src/views/BI/js/echarts4.js
+++ b/src/views/BI/js/echarts4.js
@@ -52,12 +52,8 @@ function echarts4(id) {
axisLabel: {
show: true,
// rotate: -1,
- textStyle: {
- fontSize: 14,
- // fontFamily: PangMenZhengDao,
-
- color: "#fff",
- },
+ fontSize: 14,
+ color: "#fff",
},
axisTick: {
show: false,
@@ -93,11 +89,8 @@ function echarts4(id) {
},
axisLabel: {
show: true,
- textStyle: {
- fontSize: 12,
- // fontFamily: PangMenZhengDao,
- color: "#ffffff",
- },
+ fontSize: 12,
+ color: "#ffffff",
},
splitArea: {
areaStyle: {
@@ -187,8 +180,9 @@ function echarts4(id) {
return colorList[params.dataIndex];
},
opacity: 0.7,
- // 鼠标移入柱子上 透明度变为 1
- emphasis: {
+ },
+ emphasis: {
+ itemStyle: {
opacity: 1,
},
},
diff --git a/src/views/BI/js/echarts5.js b/src/views/BI/js/echarts5.js
index 01cc9e2..8a16838 100644
--- a/src/views/BI/js/echarts5.js
+++ b/src/views/BI/js/echarts5.js
@@ -41,10 +41,8 @@ function echarts2(id, data) {
},
axisLabel: {
// 坐标轴刻度标签的相关设置
- textStyle: {
- color: "#d1e6eb",
- margin: 15,
- },
+ color: "#d1e6eb",
+ margin: 15,
},
axisTick: {
show: false,
@@ -69,9 +67,7 @@ function echarts2(id, data) {
},
axisLabel: {
margin: 20,
- textStyle: {
- color: "#d1e6eb",
- },
+ color: "#d1e6eb",
},
axisTick: {
show: false,
diff --git a/src/views/large_screen_data_display/components/full_staff_training.vue b/src/views/large_screen_data_display/components/full_staff_training.vue
index d0f8d08..7c3fc30 100644
--- a/src/views/large_screen_data_display/components/full_staff_training.vue
+++ b/src/views/large_screen_data_display/components/full_staff_training.vue
@@ -32,14 +32,6 @@ const fnInitEcharts = (data) => {
type: "shadow",
},
},
- legend: {
- data: ["各培训类型学习人数"],
- top: "15",
- textStyle: {
- color: "#2aaef2",
- },
- orient: "horizontal",
- },
grid: {
top: "25%",
right: "3%",
diff --git a/src/views/large_screen_data_display/components/hidden_danger_situation.vue b/src/views/large_screen_data_display/components/hidden_danger_situation.vue
index 03f2c62..d5e284d 100644
--- a/src/views/large_screen_data_display/components/hidden_danger_situation.vue
+++ b/src/views/large_screen_data_display/components/hidden_danger_situation.vue
@@ -65,9 +65,7 @@ const fnInitEcharts = (data) => {
},
axisLabel: {
interval: 0,
- textStyle: {
- color: "#fff",
- },
+ color: "#fff",
fontSize: 12,
margin: 15,
},
@@ -87,9 +85,7 @@ const fnInitEcharts = (data) => {
},
},
axisLabel: {
- textStyle: {
- color: "#fff",
- },
+ color: "#fff",
},
splitLine: {
show: false,
From a863a386e012265a2a2d6447fce63a4a04ca0734 Mon Sep 17 00:00:00 2001
From: LiuJiaNan
Date: Wed, 28 Feb 2024 10:27:08 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0BI=E9=A1=B5?=
=?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8C=81=E8=AF=81=E4=BD=9C=E4=B8=9A=E4=BA=BA?=
=?UTF-8?q?=E5=91=98=E5=88=B0=E6=9C=9F=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/layout/header/index.vue | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/layout/header/index.vue b/src/layout/header/index.vue
index 18a046a..17bcc6d 100644
--- a/src/layout/header/index.vue
+++ b/src/layout/header/index.vue
@@ -4,7 +4,7 @@