@@ -150,4 +176,8 @@ defineExpose({ open })
:deep(.el-dialog__body) {
max-height: none !important;
}
+.text-style {
+ cursor: pointer;
+ text-decoration: underline;
+}
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue b/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue
index 1f321d51..cbd7e069 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue
@@ -19,6 +19,10 @@
分布统计
+
+ 区域
+ 终端厂家
+
@@ -77,11 +81,12 @@ const dialogVisible: any = ref(false)
const time = ref('1')
const rowList: any = ref({})
const tableData: any = ref()
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Voltage_Level', 'Load_Type'])
const picList = ref([])
-
+const type = ref('1')
const trendEChart: any = ref({})
-
+const loadingTab = ref(false)
const picEChart = ref()
const open = async (row: any) => {
time.value = '1'
@@ -97,13 +102,49 @@ const open = async (row: any) => {
analysis(1)
dialogVisible.value = true
//分布统计
- getGridDiagramDevData(rowList.value).then(res => {
- picList.value = res.data
+ getGridDiagramDev()
+ // 列表
+ getGridDiagramDevDataList({
+ deviceInfoParam: {
+ ...row,
+ serverName: 'pqs-common',
+ ids: [row.id],
+ runFlag: [],
+ comFlag: [],
+ manufacturer: dictData.getBasicData('Dev_Manufacturers'),
+ statisticalType: dictData.getBasicData('Statistical_Type', ['Report_Type'])[0]
+ },
+ ...row,
+ serverName: 'pqs-common',
+ ids: [row.id],
+ runFlag: [],
+ comFlag: [],
+ manufacturer: dictData.getBasicData('Dev_Manufacturers'),
+ statisticalType: dictData.getBasicData('Statistical_Type', ['Report_Type'])[0]
+ }).then((res: any) => {
+ tableData.value = res.data
+ })
+}
+
+const getGridDiagramDev = async () => {
+ loadingTab.value = true
+ let data = JSON.parse(JSON.stringify(rowList.value))
+ data.deviceInfoParam.statisticalType = type.value == '1' ? classificationData[0] : classificationData[1]
+ data.statisticalType = type.value == '1' ? classificationData[0] : classificationData[1]
+
+ await getGridDiagramDevData(data).then((res: any) => {
+ const total = res.data.reduce((sum, item) => {
+ return sum + item.devCount
+ }, 0)
+
+ picList.value = type.value == '1' ? res.data : res.data.filter((item: any) => item.devCount != 0)
let picData: any = []
- res.data.forEach((item: any) => {
+ picList.value = picList.value.sort((a, b) => b.devCount - a.devCount)
+ picList.value.forEach((item: any) => {
picData.push({
value: item.devCount,
- name: `${item.orgName}`,
+ name: `${item.orgName}(${item.devCount})`,
+ proportion: (item.devCount / total).toFixed(2),
itemStyle: {
color: item.onlineEvaluate < 60 ? 'red' : item.onlineEvaluate < 90 ? 'orange' : 'green'
}
@@ -113,7 +154,7 @@ const open = async (row: any) => {
picEChart.value = {
tooltip: {
trigger: 'item',
- formatter: '{b} :在运终端数 {c} 台'
+ formatter: '{b}: 占比 {d}% '
},
legend: {
show: false
@@ -153,29 +194,8 @@ const open = async (row: any) => {
}
}
})
- // 列表
- getGridDiagramDevDataList({
- deviceInfoParam: {
- ...row,
- serverName: 'pqs-common',
- ids: [row.id],
- runFlag: [],
- comFlag: [],
- manufacturer: dictData.getBasicData('Dev_Manufacturers'),
- statisticalType: dictData.getBasicData('Statistical_Type', ['Report_Type'])[0]
- },
- ...row,
- serverName: 'pqs-common',
- ids: [row.id],
- runFlag: [],
- comFlag: [],
- manufacturer: dictData.getBasicData('Dev_Manufacturers'),
- statisticalType: dictData.getBasicData('Statistical_Type', ['Report_Type'])[0]
- }).then((res: any) => {
- tableData.value = res.data
- })
+ loadingTab.value = false
}
-
const analysis = (e: any) => {
let time = rowList.value.searchBeginTime.slice(0, 4) + `-01-01`
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/transientDetails.vue b/src/views/pqs/qualityInspeection/panorama/components/details/transientDetails.vue
new file mode 100644
index 00000000..3efa7ae4
--- /dev/null
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/transientDetails.vue
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/pqs/qualityInspeection/panorama/components/line/info.vue b/src/views/pqs/qualityInspeection/panorama/components/line/info.vue
index d901c05f..eed3f7c2 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/line/info.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/line/info.vue
@@ -3,8 +3,8 @@
- {{ dropList.lineName }}详情
- 最新数据时间:
+ {{ dropList.gdName }}_{{ dropList.bdName }}_{{ dropList.lineName }}
+ 最新数据时间:
{{ dropList.updateTime }}
统计日期:
@@ -14,21 +14,27 @@
-
+
台账信息
-
-
+
+
+ {{ dropList.bdName }}
+
+
{{ dropList.lineName }}
+
+ {{ dropList.objName }}
+
{{ dropList.manufacturer }}
{{ dropList.scale }}
{{ dropList.loginTime }}
- {{ dropList.pt }}
- {{ dropList.ct }}
+
{{ dropList.loadType }}
-
+
{{ dropList.comFlag }}
@@ -36,9 +42,12 @@
-
+
- 告警明细 (天)
+ 告警天数
@@ -78,6 +87,42 @@
+
+
+
+ 告警明细
+
+
+
+
+
+
+
+ {{ row.avg == 3.14159 ? '/' : Math.floor(row.avg * 100) / 100 }}
+
+
+
+
+ {{ row.xz == 3.14159 ? '/' : row.xz }}
+
+
+
+
+
+
@@ -92,75 +137,16 @@
/>