+
-
异常
-
-
+
+
{
pHeight
}
}
-
// 计算直线中间箭头的路径
const getLineMidArrowPath = (item) => {
const midX = (Number(item.startPointX) + Number(item.endPointX)) / 2
@@ -2738,7 +2737,6 @@ const getLineMidArrowPath = (item) => {
return `M ${startXArrow} ${startYArrow} L ${endXArrow} ${endYArrow}`
}
-
// 计算贝塞尔曲线中间箭头的路径(简单近似)
const getBezierMidArrowPath = (item) => {
const path = document.createElementNS('http://www.w3.org/2000/svg', 'path')
@@ -2748,7 +2746,6 @@ const getBezierMidArrowPath = (item) => {
const prevPoint = path.getPointAtLength(length / 2 - 1)
return `M ${prevPoint.x} ${prevPoint.y} L ${midPoint.x} ${midPoint.y}`
}
-
// 计算贝塞尔曲线中间文字的 x 坐标
const computedCurveTextX = (item) => {
return (
@@ -2759,7 +2756,6 @@ const computedCurveTextX = (item) => {
4
)
}
-
// 计算贝塞尔曲线中间文字的 y 坐标
const computedCurveTextY = (item) => {
return (
@@ -2770,7 +2766,6 @@ const computedCurveTextY = (item) => {
4
)
}
-
document.onmousedown = function (e) {
//左击
if (e.button == 2) {
diff --git a/src/views/statisticalView/index.vue b/src/views/statisticalView/index.vue
index 9ea3a082..879f3128 100644
--- a/src/views/statisticalView/index.vue
+++ b/src/views/statisticalView/index.vue
@@ -1,5 +1,5 @@
-
+
-
+
-
{{ filterTypeFun(n.deviceType, typeList) }}
+ {{
+ filterTypeFun(n.deviceType, typeList)
+ }}
-
-
- 数量:
-
-
- {{ n.totalNum || 0 }}
-
+ 数量:
+
+ {{ n.totalNum || 0 }}
+
-
@@ -308,7 +313,7 @@
import { ref, reactive, onMounted, onBeforeUnmount } from 'vue'
import { dateFormatter } from '@/utils/formatTime'
import * as ChartsApi from '@/api/boardCharts'
-import { DICT_TYPE, getIntDictOptions,getDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions, getDictOptions } from '@/utils/dict'
import indexPage from '../../mapPage/realTimeMap/components/indexPage.vue'
import * as MapApi from '@/api/map/map'
const router = useRouter() // 路由对象
@@ -316,15 +321,17 @@ const indexPageRef = ref(null)
const typeList = ref([])
defineOptions({ name: 'BoardAllBoard' })
const data = ref({
- taskStatusVO: { //顶部左边统计
+ taskStatusVO: {
+ //顶部左边统计
pendingExecutionNum: 0,
underwayNum: 0,
completedNum: 0,
cancelledNum: 0,
abnormalNum: 0,
- tasksNumber: 0,
+ tasksNumber: 0
},
- statistics: { //顶部右边 统计
+ statistics: {
+ //顶部右边 统计
total: 0,
inTask: 0,
doLock: 0,
@@ -336,7 +343,7 @@ const data = ref({
pendingExecution: [], //待执行
robotWarnMsgDOS: [], //异常信息
deviceStatusInfoVOS: [], //设备信息
- robotElectricityLevelVOS: [], //车辆信息
+ robotElectricityLevelVOS: [] //车辆信息
})
//获取数据
const getAllData = async () => {
@@ -390,11 +397,10 @@ const toManyWarnMsg = () => {
// 前往车辆看板
const goCarBord = () => {
router.push({
- path: '/board/carBoard',
-
+ path: '/board/carBoard'
})
}
-const list = ref([]) // 地图区域列表
+const list = ref([]) // 地图区域列表
const mapValue = ref([]) //选中的区域绑定的数组值
const mapInfo = ref(null) //选中的区域
//获取地图区域
@@ -530,8 +536,8 @@ const getLeft = () => {
}
const getWidthPx = () => {
let width = getElementWidthByClass('map-box-allBoard')
- // console.log("pppppppppppppp",width)
- widthVal.value = width
+ // console.log("pppppppppppppp",width)
+ widthVal.value = width
}
const getLeftWidth = () => {
nextTick(() => {
@@ -541,14 +547,14 @@ const getLeftWidth = () => {
}
//根据type和列表返回对应中文
const filterTypeFun = (type, list) => {
- if (list.length) {
- let obj = list.find(item => {
- return item.value == type
- })
- return obj == undefined ? type : obj.label
- } else {
- return type
- }
+ if (list.length) {
+ let obj = list.find((item) => {
+ return item.value == type
+ })
+ return obj == undefined ? type : obj.label
+ } else {
+ return type
+ }
}
onMounted(() => {
typeList.value = getDictOptions(DICT_TYPE.DEVICE_TYPE)
@@ -556,7 +562,6 @@ onMounted(() => {
getList()
getLeftWidth()
window.addEventListener('resize', getLeftWidth)
-
})
onBeforeUnmount(() => {
window.removeEventListener('resize', getLeftWidth)
@@ -754,25 +759,29 @@ onBeforeUnmount(() => {
flex-shrink: 0;
margin-left: 16px;
}
-.noBoarder{
+.noBoarder {
border-right: none;
}
-.scroll-container-item-right-item{
+.scroll-container-item-right-item {
display: flex;
flex-shrink: 0;
}
-.scroll-container-item-right-item-title{
- font-family: PingFangSC, PingFang SC;
-font-weight: 400;
-font-size: 12px;
-color: #0D162A;
-flex-shrink: 0;
+.scroll-container-item-right-item-title {
+ font-family:
+ PingFangSC,
+ PingFang SC;
+ font-weight: 400;
+ font-size: 12px;
+ color: #0d162a;
+ flex-shrink: 0;
}
-.scroll-container-item-right-item-num{
- font-family: PingFangSC, PingFang SC;
-font-weight: 400;
-font-size: 12px;
-color: #0D162A;
-flex-shrink: 0;
+.scroll-container-item-right-item-num {
+ font-family:
+ PingFangSC,
+ PingFang SC;
+ font-weight: 400;
+ font-size: 12px;
+ color: #0d162a;
+ flex-shrink: 0;
}
diff --git a/src/views/mapPage/logList/index.vue b/src/views/mapPage/logList/index.vue
index 3aa70f45..ce051036 100644
--- a/src/views/mapPage/logList/index.vue
+++ b/src/views/mapPage/logList/index.vue
@@ -253,8 +253,20 @@
- 正常数量:
-
-
- {{ n.normalNum || 0 }}
-
+
+
- 正常数量:
+
+ {{ n.normalNum || 0 }}
+
-
- 异常数量:
-
-
- {{ n.abnormalNum || 0 }}
-
+
+
异常数量:
+
+ {{ n.abnormalNum || 0 }}
+
统计视图
@@ -12,18 +12,18 @@
看板管理
+
-
+
-
+
@@ -31,13 +31,13 @@
-
+
-
+
任务总览
任务完成率
AGV工作利用率统计
任务异常数