冀北问题修改

src/views/pqs/runManage/alarmCleaning/components/alarm.vue

@@ -476,6 +476,7 @@ tableStore.table.params.name = ''
 provide('tableStore', tableStore)
 </script>
 <style lang="scss" scoped>
+      @import '@/assets/font/iconfont.css';
 .card-list {
     display: flex;
     .monitoringPoints {

src/views/pqs/runManage/cleaning/components/abnormal.vue

@@ -518,6 +518,7 @@ tableStore.table.params.name = ''
 provide('tableStore', tableStore)
 </script>
 <style lang="scss" scoped>
+      @import '@/assets/font/iconfont.css';
 .card-list {
     display: flex;
     .monitoringPoints {

src/views/pqs/runManage/cleaning/components/anomalyDetails.vue

@@ -1,137 +1,170 @@
-<template>
-    <el-dialog draggable width="1550px" class="cn-operate-dialog" v-model="dialogVisible" :title="title">
-        <div style="display: flex">
-            <div :style="height1" class="mr10 box" style="width: 600px">
-                <vxe-table
-                    height="auto"
-                    :data="TableData"
-                    v-bind="defaultAttribute"
-                    ref="tableRef"
-                    :row-config="{ isCurrent: true, isHover: true }"
-                    @current-change="currentChangeEvent"
-                >
-                    <vxe-column type="seq" title="序号" width="60px"></vxe-column>
-                    <vxe-column field="date" title="日期"></vxe-column>
-                    <vxe-column field="bdName" title="所属电站(场站)" width="120px"></vxe-column>
-                    <vxe-column field="monitorName" title="监测点名称" width="120px"></vxe-column>
-                    <vxe-column field="timeSum" title="异常时间(分钟)" width="80px"></vxe-column>
-                    <vxe-column field="errCount" title="异常次数" width="80px"></vxe-column>
-                </vxe-table>
-            </div>
-
-            <div :style="height" style="width: 920px" v-loading="loading1">
-                <vxe-table
-                    height="auto"
-                    :data="TableData1.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
-                    v-bind="defaultAttribute"
-                >
-                    <vxe-column type="seq" title="序号" width="80px">
-                        <template #default="{ rowIndex }">
-                            <span>{{ (pageNum - 1) * pageSize + rowIndex + 1 }}</span>
-                        </template>
-                    </vxe-column>
-                    <vxe-column field="time" title="时间" width="150px"></vxe-column>
-                    <vxe-column field="targetName" title="指标类型" min-width="80px"></vxe-column>
-                    <vxe-column field="phaseType" title="相别" width="60px">
-                        <template v-slot="{ row }">
-                        {{ row.phaseType=='T'?'/':row.phaseType }}
-                        </template>
-                    </vxe-column>
-                    <vxe-column field="rangeDesc" title="合理范围" min-width="90px"></vxe-column>
-                    <vxe-column field="max" title="最大" width="85px" :formatter="formatter"></vxe-column>
-                    <vxe-column field="min" title="最小" width="85px" :formatter="formatter"></vxe-column>
-                    <vxe-column field="avg" title="平均" width="85px" :formatter="formatter"></vxe-column>
-                    <vxe-column field="cp95" title="CP95" width="85px" :formatter="formatter"></vxe-column>
-                </vxe-table>
-                <div class="table-pagination">
-                    <el-pagination
-                        v-model:currentPage="pageNum"
-                        v-model:page-size="pageSize"
-                        :page-sizes="[10, 20, 50, 100, 200]"
-                        background
-                        layout="sizes,total, ->, prev, pager, next, jumper"
-                        :total="TableData1.length"
-                    ></el-pagination>
-                </div>
-            </div>
-        </div>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, inject } from 'vue'
-import { reactive } from 'vue'
-import { defaultAttribute } from '@/components/table/defaultAttribute'
-import { ElMessage } from 'element-plus'
-import { monitorAbnormalTable, monitorAbnormalTableDetail } from '@/api/device-boot/dataVerify'
-import { mainHeight } from '@/utils/layout'
-const dialogVisible = ref(false)
-const height1 = mainHeight(-110, 2)
-const height = mainHeight(10, 2)
-const tableRef = ref()
-const title = ref('')
-const loading1 = ref(false)
-const TableData = ref([])
-const TableData1 = ref([])
-const pageNum = ref(1)
-const pageSize = ref(20)
-const numKey = ref(0)
-const targetKey = ref('')
-const open = (data: anyObj, time: string[], num: number) => {
-    // title.value = (num == 0 ? data.targetName : data.monitorName) + '_异常监测点详情'
-    title.value ='异常监测点详情'
-    TableData.value = []
-    numKey.value = num
-    targetKey.value = data.key
-    monitorAbnormalTable({
-        monitorIds: num == 0 ? data.ids : [data.monitorId],
-        targetKey: num == 0 ? data.key : '',
-        searchBeginTime: time[0],
-        searchEndTime: time[1]
-    }).then(res => {
-        TableData.value = res.data
-        tableRef.value.setCurrentRow(TableData.value[0])
-        currentChangeEvent()
-    })
-    dialogVisible.value = true
-}
-const currentChangeEvent = () => {
-    loading1.value = true
-    let data = tableRef.value.getCurrentRecord()
-    TableData1.value = []
-    monitorAbnormalTableDetail({
-        monitorIds: [data.monitorId],
-        searchBeginTime: data.date,
-        targetKey: numKey.value == 0 ? targetKey.value : ''
-    })
-        .then(res => {
-            TableData1.value = res.data
-            loading1.value = false
-            pageNum.value = 1
-        })
-        .catch(() => {
-            loading1.value = false
-        })
-}
-const formatter = (row: any) => {
-    return row.cellValue == null ? '/' : (row.cellValue - 0).toFixed(2)
-}
-defineExpose({ open })
-</script>
-<style lang="scss" scoped>
-.table-pagination {
-    height: 58px;
-    box-sizing: border-box;
-    width: 100%;
-    max-width: 100%;
-    background-color: var(--ba-bg-color-overlay);
-    padding: 13px 15px;
-    border-left: 1px solid #e4e7e9;
-    border-right: 1px solid #e4e7e9;
-    border-bottom: 1px solid #e4e7e9;
-}
-:deep(.box) {
-    .row--current {
-        background-color: var(--el-color-primary-light-8) !important;
-    }
-}
-</style>
+<template>
+    <el-dialog draggable width="1550px" class="cn-operate-dialog" v-model="dialogVisible" :title="title">
+        <div style="display: flex">
+            <div :style="height1" class="mr10 box" style="width: 600px">
+                <vxe-table
+                    height="auto"
+                    :data="TableData"
+                    v-bind="defaultAttribute"
+                    ref="tableRef"
+                    :row-config="{ isCurrent: true, isHover: true }"
+                    @current-change="currentChangeEvent"
+                >
+                    <vxe-column type="seq" title="序号" width="60px"></vxe-column>
+                    <vxe-column field="date" title="日期"></vxe-column>
+                    <vxe-column field="bdName" title="所属电站(场站)" width="120px"></vxe-column>
+                    <vxe-column field="monitorName" title="监测点名称" width="120px"></vxe-column>
+                    <vxe-column field="timeSum" title="异常时间(分钟)" width="80px"></vxe-column>
+                    <vxe-column field="errCount" title="异常次数" width="80px"></vxe-column>
+                </vxe-table>
+            </div>
+
+            <div :style="height" style="width: 920px" v-loading="loading1">
+                <vxe-table
+                    height="auto"
+                    :data="TableData1.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
+                    v-bind="defaultAttribute"
+                >
+                    <vxe-column type="seq" title="序号" width="80px">
+                        <template #default="{ rowIndex }">
+                            <span>{{ (pageNum - 1) * pageSize + rowIndex + 1 }}</span>
+                        </template>
+                    </vxe-column>
+                    <vxe-column field="time" title="时间" width="150px"></vxe-column>
+                    <vxe-column field="targetName" title="指标类型" min-width="80px"></vxe-column>
+                    <vxe-column field="phaseType" title="相别" width="60px">
+                        <template v-slot="{ row }">
+                            {{ row.phaseType == 'T' ? '/' : row.phaseType }}
+                        </template>
+                    </vxe-column>
+                    <vxe-column field="rangeDesc" title="合理范围" min-width="90px"></vxe-column>
+                    <vxe-column
+                        field="max"
+                        title="最大"
+                        width="85px"
+                        :formatter="formatter"
+                        v-if="showColumn"
+                    ></vxe-column>
+                    <vxe-column
+                        field="min"
+                        title="最小"
+                        width="85px"
+                        :formatter="formatter"
+                        v-if="showColumn"
+                    ></vxe-column>
+                    <vxe-column
+                        field="avg"
+                        title="平均"
+                        width="85px"
+                        :formatter="formatter"
+                        v-if="showColumn"
+                    ></vxe-column>
+                    <vxe-column
+                        field="cp95"
+                        title="CP95"
+                        width="85px"
+                        :formatter="formatter"
+                        v-if="showColumn"
+                    ></vxe-column>
+                    <vxe-column
+                        field="featureAmplitude"
+                        title="幅值"
+                        width="85px"
+                        :formatter="formatter"
+                        v-if="!showColumn"
+                    ></vxe-column>
+                </vxe-table>
+                <div class="table-pagination">
+                    <el-pagination
+                        v-model:currentPage="pageNum"
+                        v-model:page-size="pageSize"
+                        :page-sizes="[10, 20, 50, 100, 200]"
+                        background
+                        layout="sizes,total, ->, prev, pager, next, jumper"
+                        :total="TableData1.length"
+                    ></el-pagination>
+                </div>
+            </div>
+        </div>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { reactive } from 'vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { ElMessage } from 'element-plus'
+import { monitorAbnormalTable, monitorAbnormalTableDetail } from '@/api/device-boot/dataVerify'
+import { mainHeight } from '@/utils/layout'
+const dialogVisible = ref(false)
+const height1 = mainHeight(-110, 2)
+const height = mainHeight(10, 2)
+const tableRef = ref()
+const title = ref('')
+const loading1 = ref(false)
+const TableData = ref([])
+const TableData1 = ref([])
+const pageNum = ref(1)
+const pageSize = ref(20)
+const numKey = ref(0)
+const targetKey = ref('')
+const showColumn = ref(true)
+const open = (data: anyObj, time: string[], num: number) => {
+    // title.value = (num == 0 ? data.targetName : data.monitorName) + '_异常监测点详情'
+    title.value = '异常监测点详情'
+    TableData.value = []
+    numKey.value = num
+    targetKey.value = data.key
+    monitorAbnormalTable({
+        monitorIds: num == 0 ? data.ids : [data.monitorId],
+        targetKey: num == 0 ? data.key : '',
+        searchBeginTime: time[0],
+        searchEndTime: time[1]
+    }).then(res => {
+        TableData.value = res.data
+        tableRef.value.setCurrentRow(TableData.value[0])
+        currentChangeEvent()
+    })
+    dialogVisible.value = true
+}
+const currentChangeEvent = () => {
+    loading1.value = true
+    let data = tableRef.value.getCurrentRecord()
+    TableData1.value = []
+    monitorAbnormalTableDetail({
+        monitorIds: [data.monitorId],
+        searchBeginTime: data.date,
+        targetKey: numKey.value == 0 ? targetKey.value : ''
+    })
+        .then(res => {
+            TableData1.value = res.data
+            showColumn.value = res.data[0]?.featureAmplitude == null ? true : false
+            loading1.value = false
+            pageNum.value = 1
+        })
+        .catch(() => {
+            loading1.value = false
+        })
+}
+const formatter = (row: any) => {
+    return row.cellValue == null ? '/' : (row.cellValue - 0).toFixed(2)
+}
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+.table-pagination {
+    height: 58px;
+    box-sizing: border-box;
+    width: 100%;
+    max-width: 100%;
+    background-color: var(--ba-bg-color-overlay);
+    padding: 13px 15px;
+    border-left: 1px solid #e4e7e9;
+    border-right: 1px solid #e4e7e9;
+    border-bottom: 1px solid #e4e7e9;
+}
+:deep(.box) {
+    .row--current {
+        background-color: var(--el-color-primary-light-8) !important;
+    }
+}
+</style>

src/views/pqs/runManage/runEvaluate/components/statistics_JB.vue

@@ -0,0 +1,121 @@
+<template>
+    <div style="height: 145px" class="box1">
+        <!-- <div class="boxDiv hexagon">
+            <div class="text-style" @click="change('')">{{ props.params.allNum }}</div>
+            <div class="mt10 divBot">总数</div>
+        </div>
+        <div class="boxDiv hexagon hexagon1">
+            <div class="text-style" @click="change('运行')">{{ props.params.runNum }}</div>
+            <div class="mt10 divBot">在运</div>
+        </div>
+        <div class="boxDiv hexagon hexagon2">
+            <div class="text-style" @click="change('调试')">{{ props.params.checkNum }}</div>
+            <div class="mt10 divBot">调试</div>
+        </div>
+        <div class="boxDiv hexagon hexagon3">
+            <div class="text-style" @click="change('停运')">{{ props.params.stopRunNum }}</div>
+            <div class="mt10 divBot">停运</div>
+        </div> -->
+        <div class="statistics">
+            <div class="divBox div1">
+                <span class="iconfont icon-qiyezongshu" style="color: #57bc6e"></span>
+                <span class="divBox_title">终端总数</span>
+                <span class="divBox_num text-style" style="color: #57bc6e" @click="change('')">
+                    {{ props.params.allNum }}
+                </span>
+            </div>
+            <div class="divBox div2" style="width: 210px">
+                <span class="iconfont icon-zaiyunshebei" style="color: #67c23a"></span>
+                <span class="divBox_title">在运终端数</span>
+                <span class="divBox_num text-style" style="color: #67c23a" @click="change('运行')">
+                    {{ props.params.runNum }}
+                </span>
+            </div>
+        </div>
+        <div class="statistics">
+            <div class="divBox div3">
+                <span class="iconfont icon-yichanglei_14feizhinengbiaozaiyunyichang" style="color: #ffbf00"></span>
+                <span class="divBox_title">调试终端数</span>
+                <span class="divBox_num text-style" style="color: #ffbf00" @click="change('调试')">
+                    {{ props.params.checkNum }}
+                </span>
+            </div>
+            <div class="divBox div4" style="width: 210px">
+                <span class="iconfont icon-tingyunshijianguanli" style="color: #f56c6c"></span>
+                <span class="divBox_title">停运终端数</span>
+                <span class="divBox_num text-style" style="color: #f56c6c" @click="change('停运')">
+                    {{ props.params.stopRunNum }}
+                </span>
+            </div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, reactive, onMounted } from 'vue'
+import MyEChart from '@/components/echarts/MyEchart.vue'
+import { mainHeight } from '@/utils/layout'
+import { color } from '@/components/echarts/color'
+const emit = defineEmits(['change'])
+const height = mainHeight(330, 3)
+const props = defineProps({
+    params: {
+        type: Object,
+        default: () => {}
+    }
+})
+const change = (e: string) => {
+    emit('change', e)
+}
+const info = () => {}
+onMounted(() => {
+    info()
+})
+</script>
+<style lang="scss" scoped>
+      @import '@/assets/font/iconfont.css';
+.statistics {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    margin-bottom: 10px;
+    .divBox {
+        width: 210px;
+        height: 70px;
+        padding: 10px;
+        display: flex;
+
+        .iconfont {
+            font-size: 40px;
+            margin-right: 5px;
+        }
+        .divBox_title {
+            font-weight: 550;
+        }
+        .divBox_num {
+            font-size: 20px;
+            font-weight: 550;
+            margin-left: auto;
+            font-family: AlimamaDongFangDaKai;
+        }
+        align-items: center;
+        // text-align: center;
+        border-radius: 5px;
+    }
+    .div1 {
+        background-color: #eef8f0;
+    }
+    .div2 {
+        background-color: #67c23a24;
+    }
+    .div3 {
+        background-color: #ffbf0024;
+    }
+    .div4 {
+        background-color: #f56c6c24;
+    }
+}
+.text-style {
+    cursor: pointer;
+    text-decoration: underline;
+}
+</style>

src/views/pqs/runManage/runEvaluate/index_JB.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader date-picker ref="TableHeaderRef" :dateLabel="`数据统计时间`">
+        <TableHeader date-picker ref="TableHeaderRef" >
             <template v-slot:select>
                 <el-form-item label="运行状态">
                     <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
@@ -23,7 +23,7 @@
         </TableHeader>
         <div class="card-list pt10" v-loading="tableStore.table.loading">
             <div class="monitoringPoints">
-                <el-card style="height: 200px">
+                <el-card style="height: 215px">
                     <template #header>
                         <div class="card-header">
                             <span>终端统计</span>
@@ -68,7 +68,7 @@
                         <span style="width: 90px">终端总数</span>
                         <span style="flex: 1">完整性(%)</span>
                         <span style="width: 80px">在线率(%)</span>
-                        <span style="width: 80px">合格率(%)</span>
+                        <span style="width: 80px">异常率(%)</span>
                     </div>
                     <div :style="indicatorHeight" style="overflow-y: auto">
                         <div v-for="o in abnormal" class="abnormal mb10">
@@ -165,7 +165,7 @@
                         </vxe-column>
                         <vxe-column field="integrityRate" title="完整性(%)" width="100px"></vxe-column>
                         <vxe-column field="onLineRate" title="在线率(%)" width="100px"></vxe-column>
-                        <vxe-column field="passRate" title="合格率(%)" width="100px"></vxe-column>
+                        <vxe-column field="passRate" title="异常率(%)" width="100px"></vxe-column>
                     </vxe-table>
                 </div>
                 <div class="table-pagination">
@@ -191,7 +191,7 @@ import { onMounted, provide, ref } from 'vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { useDictData } from '@/stores/dictData'
 import { mainHeight } from '@/utils/layout'
-import statistics from './components/statistics.vue'
+import statistics from './components/statistics_JB.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { getMonitorVerifyDay } from '@/api/device-boot/dataVerify'
 defineOptions({
@@ -201,7 +201,7 @@ defineOptions({
 const dictData = useDictData()
 //字典获取监督对象类型
 const pageHeight = mainHeight(97)
-const indicatorHeight = mainHeight(447)
+const indicatorHeight = mainHeight(462)
 const monitoringPoints = ref({
     runNum: 0,
     abnormalNum: 0,
@@ -269,7 +269,9 @@ const tableStore = new TableStore({
         statisticsList.value.checkNum = totalData.value.filter(item => item.runFlag === '调试').length
         statisticsList.value.stopRunNum = totalData.value.filter(item => item.runFlag === '停运').length
 
-        abnormal.value = tableStore.table.data
+        abnormal.value = tableStore.table.data.filter(
+            (k: any) => k.name != '上送国网' && k.name != '非上送国网'
+        )
         // 合并子集数据 并去重
 
         totalTable(101, '')
@@ -484,7 +486,7 @@ provide('tableStore', tableStore)
             justify-content: space-between;
             margin-bottom: 10px;
             .divBox {
-                width: 200px;
+                width: 215x;
                 height: 70px;
                 padding: 10px;
                 display: flex;