From 7308148b69df359dffa70033b48f0345c4cbf263 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 16 Feb 2023 13:45:34 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=E8=A7=86=E9=A2=91=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83,=20=E4=BB=AA=E8=A1=A8=E7=9B=98=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/media/DashBoard/components/Card.vue | 79 ++++++++++++++--
 src/views/media/DashBoard/index.vue           | 90 ++++++++++++++-----
 src/views/media/DashBoard/typings.d.ts        |  2 +-
 .../media/Home/components/BasicCountCard.vue  |  4 +-
 4 files changed, 142 insertions(+), 33 deletions(-)

diff --git a/src/views/media/DashBoard/components/Card.vue b/src/views/media/DashBoard/components/Card.vue
index 3ace789d..4c3c64bf 100644
--- a/src/views/media/DashBoard/components/Card.vue
+++ b/src/views/media/DashBoard/components/Card.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="page-container">
+    <div class="wrapper">
         <div class="card-header">
             <div class="title">{{ title }}</div>
             <div class="tools">
@@ -13,18 +13,28 @@
                         <a-radio-button value="month">近一月</a-radio-button>
                         <a-radio-button value="year">近一年</a-radio-button>
                     </a-radio-group>
-                    <a-range-picker v-model:value="dateRange" />
+                    <a-range-picker
+                        format="YYYY-MM-DD HH:mm:ss"
+                        valueFormat="x"
+                        v-model:value="dateRange"
+                    />
                 </a-space>
             </div>
         </div>
-        <div class="chart" ref="chartRef"></div>
+        <div v-if="chartData.length" class="chart" ref="chartRef"></div>
+        <a-empty v-else class="no-data" description="暂无数据"></a-empty>
     </div>
 </template>
 
 <script setup lang="ts">
 import * as echarts from 'echarts';
+import moment from 'moment';
 
 // const { proxy } = <any>getCurrentInstance();
+type Emits = {
+    (e: 'change', data: any): void;
+};
+const emits = defineEmits<Emits>();
 
 const props = defineProps({
     title: { type: String, default: '' },
@@ -34,7 +44,10 @@ const props = defineProps({
 
 // 统计时间维度
 const dimension = ref('week');
-const dateRange = ref<any>([]);
+const dateRange = ref<any>([
+    moment().subtract(1, 'week').format('x'),
+    moment().format('x'),
+]);
 
 /**
  * 绘制图表
@@ -92,6 +105,7 @@ const createChart = () => {
                 },
             ],
         };
+
         myChart.setOption(options);
         window.addEventListener('resize', function () {
             myChart.resize();
@@ -101,24 +115,73 @@ const createChart = () => {
 
 watch(
     () => props.chartData,
-    () => createChart(),
+    (val) => {
+        console.log('createChart', val);
+
+        createChart();
+    },
+    { deep: true },
+);
+watch(
+    () => dateRange.value,
+    (val) => {
+        emits('change', {
+            time: {
+                start: val[0],
+                end: val[1],
+            },
+        });
+    },
     { immediate: true, deep: true },
 );
+watch(
+    () => dimension.value,
+    (val) => {
+        if (val === 'today') {
+            dateRange[0] = moment().startOf('day').format('x');
+        }
+        if (val === 'week') {
+            dateRange[0] = moment().subtract(1, 'week').format('x');
+        }
+        if (val === 'month') {
+            dateRange[0] = moment().subtract(1, 'month').format('x');
+        }
+        if (val === 'year') {
+            dateRange[0] = moment().subtract(1, 'year').format('x');
+        }
+        dateRange[1] = moment().format('x');
+        emits('change', {
+            time: {
+                start: dateRange[0],
+                end: dateRange[1],
+            },
+        });
+    },
+);
 </script>
 
 <style scoped lang="less">
-.page-container {
+.wrapper {
+    padding: 24px;
+    background-color: #fff;
     .card-header {
         display: flex;
         justify-content: space-between;
+        margin-bottom: 24px;
         .title {
             font-weight: 700;
             font-size: 16px;
         }
     }
-    .chart {
+    .chart,
+    .no-data {
         width: 100%;
-        height: 100%;
+        min-height: calc(100vh - 430px);
+    }
+    .no-data {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
     }
 }
 </style>
diff --git a/src/views/media/DashBoard/index.vue b/src/views/media/DashBoard/index.vue
index e4190862..e9b1a75b 100644
--- a/src/views/media/DashBoard/index.vue
+++ b/src/views/media/DashBoard/index.vue
@@ -34,8 +34,12 @@
                     :value="aggPlayingTotal"
                 />
             </a-col>
-            <a-col :span="24">
-                <Card title="播放数量(人次)" :chartData="chartData" />
+            <a-col :span="24" class="dash-board-bottom">
+                <Card
+                    title="播放数量(人次)"
+                    :chartData="chartData"
+                    @change="getPlayCount"
+                />
             </a-col>
         </a-row>
     </div>
@@ -50,6 +54,7 @@ import dashboardApi from '@/api/media/dashboard';
 import type { Footer } from '@/views/media/DashBoard/typings';
 import encodeQuery from '@/utils/encodeQuery';
 import { timestampFormat } from '@/utils/utils';
+import moment from 'moment';
 
 // 设备
 const deviceFooter = ref<Footer[]>([]);
@@ -114,10 +119,12 @@ const aggTotal = ref(0);
 const getAggData = () => {
     dashboardApi.agg().then((res) => {
         aggTotal.value = res.result.total;
-        aggFooter.value.push({
-            title: '总时长',
-            value: timestampFormat(res.result.duration),
-        });
+        aggFooter.value = [
+            {
+                title: '总时长',
+                value: timestampFormat(res.result.duration),
+            },
+        ];
     });
 };
 getAggData();
@@ -128,10 +135,12 @@ const aggPlayingTotal = ref(0);
 const getAggPlayingData = () => {
     dashboardApi.aggPlaying().then((res) => {
         aggTotal.value = res.result.playingTotal;
-        aggPlayingFooter.value.push({
-            title: '播放人数',
-            value: res.result.playerTotal,
-        });
+        aggPlayingFooter.value = [
+            {
+                title: '播放人数',
+                value: res.result.playerTotal,
+            },
+        ];
     });
 };
 getAggPlayingData();
@@ -140,24 +149,61 @@ getAggPlayingData();
  * 获取播放数量(人次)
  */
 const chartData = ref([]);
-const getPlayCount = async () => {
-    const params = {};
-    dashboardApi.getPlayCount(params).then((res) => {
-        let result: any = [];
-        res.result.forEach((item: any) => {
-            result = [...result, ...item.data];
+const getPlayCount = async (params: any) => {
+    let _time = '1h';
+    let _limit = 12;
+    const dt = params.time.end - params.time.start;
+    const hour = 60 * 60 * 1000;
+    const day = hour * 24;
+    const month = day * 30;
+    const year = 365 * day;
+    if (dt <= day) {
+        _limit = Math.abs(Math.ceil(dt / hour));
+    } else if (dt > day && dt < year) {
+        _limit = Math.abs(Math.ceil(dt / day));
+        _time = '1d';
+    } else if (dt >= year) {
+        _limit = Math.abs(Math.floor(dt / month));
+        _time = '1M';
+    }
+    dashboardApi
+        .getPlayCount([
+            {
+                dashboard: 'media_stream',
+                object: 'play_count',
+                measurement: 'quantity',
+                dimension: 'agg',
+                group: 'playCount',
+                params: {
+                    time: _time,
+                    from: moment(Number(params.time.start)).format(
+                        'YYYY-MM-DD HH:mm:ss',
+                    ),
+                    to: moment(Number(params.time.end)).format(
+                        'YYYY-MM-DD HH:mm:ss',
+                    ),
+                    limit: _limit,
+                },
+            },
+        ])
+        .then((res) => {
+            let result: any = [];
+            res.result.forEach((item: any) => {
+                result = [...result, ...item.data];
+            });
+            chartData.value = result.map((m: any) => ({
+                x: m.timeString,
+                value: m.value,
+            }));
         });
-        chartData.value = result.map((m: any) => ({
-            x: m.timeString,
-            value: m.value,
-        }));
-    });
 };
-getPlayCount();
 </script>
 
 <style lang="less" scoped>
 .page-container {
     padding: 24px;
+    .dash-board-bottom {
+        margin-top: 24px;
+    }
 }
 </style>
diff --git a/src/views/media/DashBoard/typings.d.ts b/src/views/media/DashBoard/typings.d.ts
index 67b6e20c..f344c699 100644
--- a/src/views/media/DashBoard/typings.d.ts
+++ b/src/views/media/DashBoard/typings.d.ts
@@ -11,6 +11,6 @@ export type AggPlaying = {
 export type Footer = {
     title: string;
     value: number | string;
-    status?: "default" | "error" | "success" | "warning" | "processing"
+    status?: "default" | "error" | "success" | "warning" | "processing" | ""
 }
 
diff --git a/src/views/media/Home/components/BasicCountCard.vue b/src/views/media/Home/components/BasicCountCard.vue
index 53cb6d36..203b9a14 100644
--- a/src/views/media/Home/components/BasicCountCard.vue
+++ b/src/views/media/Home/components/BasicCountCard.vue
@@ -36,10 +36,10 @@ onMounted(() => {
 });
 
 const getData = () => {
-    homeApi.deviceCount().then((resp) => {
+    homeApi.deviceCount({}).then((resp) => {
         deviceCount.value = resp.result;
     });
-    homeApi.channelCount().then((resp) => {
+    homeApi.channelCount({}).then((resp) => {
         channelCount.value = resp.result;
     });
 };

From b2653adda5543949e27560f40c0d1011874e95b0 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 16 Feb 2023 14:03:46 +0800
Subject: [PATCH 2/7] =?UTF-8?q?update:=20=E4=BB=A3=E7=A0=81=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=99=A8=E6=94=AF=E6=8C=81=E8=84=9A=E6=9C=AC=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MonacoEditor/index.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/MonacoEditor/index.vue b/src/components/MonacoEditor/index.vue
index 9b8b725c..6762be92 100644
--- a/src/components/MonacoEditor/index.vue
+++ b/src/components/MonacoEditor/index.vue
@@ -13,7 +13,7 @@ import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker';
 import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker';
 
 self.MonacoEnvironment = {
-    getWorker(workerId, label) {
+    getWorker(_, label) {
         if (label === 'json') {
             return new jsonWorker();
         }
@@ -23,7 +23,7 @@ self.MonacoEnvironment = {
         if (label === 'html') {
             return new htmlWorker();
         }
-        if (label === 'ts') {
+        if (['typescript', 'javascript'].includes(label)) {
             return new tsWorker();
         }
         return new editorWorker();
@@ -33,6 +33,7 @@ self.MonacoEnvironment = {
 const props = defineProps({
     modelValue: [String, Number],
     theme: { type: String, default: 'vs-dark' },
+    language: { type: String, default: 'json' },
 });
 
 const emit = defineEmits(['update:modelValue']);
@@ -42,10 +43,10 @@ const dom = ref();
 let instance;
 
 onMounted(() => {
-    const jsonModel = monaco.editor.createModel(props.modelValue, 'json');
+    const _model = monaco.editor.createModel(props.modelValue, props.language);
 
     instance = monaco.editor.create(dom.value, {
-        model: jsonModel,
+        model: _model,
         tabSize: 2,
         automaticLayout: true,
         scrollBeyondLastLine: false,

From bf6c705eda5d30881a2ee2b954de3e123e6cc078 Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Thu, 16 Feb 2023 14:31:44 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DPermissionButton?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PermissionButton/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/PermissionButton/index.vue b/src/components/PermissionButton/index.vue
index ee9af547..57268e91 100644
--- a/src/components/PermissionButton/index.vue
+++ b/src/components/PermissionButton/index.vue
@@ -100,8 +100,8 @@ const isPermission = computed(() => {
 })
 const _isPermission = computed(() =>
   'hasPermission' in props && isPermission.value
-    ? 'disabled' in buttonProps
-      ? buttonProps.disabled as boolean
+    ? 'disabled' in _buttonProps
+      ? _buttonProps.disabled as boolean
       : false
     : true
 )

From 40a62317d90ef8f095b1d1d0d9bfd616c9f32d25 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Thu, 16 Feb 2023 16:05:29 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=E5=91=8A=E8=AD=A6=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E4=BB=AA=E8=A1=A8=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/rule-engine/Instance/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/rule-engine/Instance/index.vue b/src/views/rule-engine/Instance/index.vue
index d47885f7..f0923f3f 100644
--- a/src/views/rule-engine/Instance/index.vue
+++ b/src/views/rule-engine/Instance/index.vue
@@ -1,6 +1,6 @@
 <template>
     <page-container>
-        <a-card>
+        <div>
             <Search :columns="query.columns" target="device-instance" @search="handleSearch"></Search>
             <JTable
                 :columns="columns"
@@ -147,7 +147,7 @@
                 :title="title"
                 @success="refresh"
             />
-        </a-card>
+        </div>
     </page-container>
 </template>
 
@@ -209,8 +209,8 @@ const columns = [
     },
     {
         title: '说明',
-        dataIndex: 'describe',
-        key: 'describe',
+        dataIndex: 'description',
+        key: 'description',
     },
     {
         title: '操作',

From 293bba37a11ef2b0413836abe5ca65a9cbea542c Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Thu, 16 Feb 2023 16:07:14 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=E5=91=8A=E8=AD=A6=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E4=BB=AA=E8=A1=A8=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/rule-engine/dashboard.ts              |  20 +
 src/views/device/DashBoard/index.vue          |   3 +-
 .../DashBoard/components/Charts.vue           |  43 ++
 .../DashBoard/components/Guide.vue            |  60 ++
 .../DashBoard/components/NewAlarm.vue         | 152 +++++
 .../DashBoard/components/TimeSelect.vue       | 117 ++++
 .../DashBoard/components/TopCard.vue          | 106 ++++
 src/views/rule-engine/DashBoard/index.vue     | 547 ++++++++++++++++++
 src/views/rule-engine/DashBoard/typings.d.ts  |   5 +
 vite.config.ts                                |   4 +-
 10 files changed, 1054 insertions(+), 3 deletions(-)
 create mode 100644 src/api/rule-engine/dashboard.ts
 create mode 100644 src/views/rule-engine/DashBoard/components/Charts.vue
 create mode 100644 src/views/rule-engine/DashBoard/components/Guide.vue
 create mode 100644 src/views/rule-engine/DashBoard/components/NewAlarm.vue
 create mode 100644 src/views/rule-engine/DashBoard/components/TimeSelect.vue
 create mode 100644 src/views/rule-engine/DashBoard/components/TopCard.vue
 create mode 100644 src/views/rule-engine/DashBoard/index.vue
 create mode 100644 src/views/rule-engine/DashBoard/typings.d.ts

diff --git a/src/api/rule-engine/dashboard.ts b/src/api/rule-engine/dashboard.ts
new file mode 100644
index 00000000..7563bbeb
--- /dev/null
+++ b/src/api/rule-engine/dashboard.ts
@@ -0,0 +1,20 @@
+import server from '@/utils/request';
+/**
+ * 获取今日及当月告警数量
+ */
+export const dashboard = (data:Record<string,any[]>)=> server.post('/dashboard/_multi',data);
+
+/**
+ * 
+ */
+export const getAlarm = (params:Record<string,any[]>) => server.get('/alarm/record/_query',params);
+
+/**
+ * 获取告警数量
+ */
+export const getAlarmConfigCount = (data:Record<string,any>) => server.post('/alarm/config/_count',data);
+
+/**
+ * 获取报警等级
+ */
+export const getAlarmLevel = () => server.get('/alarm/config/default/level');
\ No newline at end of file
diff --git a/src/views/device/DashBoard/index.vue b/src/views/device/DashBoard/index.vue
index e1a8a051..d1722caf 100644
--- a/src/views/device/DashBoard/index.vue
+++ b/src/views/device/DashBoard/index.vue
@@ -40,7 +40,7 @@
                         <Charts :options="TodayDevOptions"></Charts> </TopCard
                 ></a-col>
             </a-row>
-            <a-row :span="24">
+            <a-row :gutter="24">
                 <a-col :span="24">
                     <div class="message-card">
                         <Guide title="设备消息">
@@ -452,6 +452,7 @@ const getEcharts = (data: any) => {
         _time = '1M';
         format = 'yyyy年-M月';
     }
+    
     dashboard([
         {
             dashboard: 'device',
diff --git a/src/views/rule-engine/DashBoard/components/Charts.vue b/src/views/rule-engine/DashBoard/components/Charts.vue
new file mode 100644
index 00000000..9c5a4031
--- /dev/null
+++ b/src/views/rule-engine/DashBoard/components/Charts.vue
@@ -0,0 +1,43 @@
+<template>
+    <div class="chart" ref="chart"></div>
+</template>
+
+<script setup lang="ts">
+import * as echarts from 'echarts';
+
+const { proxy } = <any>getCurrentInstance();
+
+const props = defineProps({
+    // 图表数据
+    options:{
+        type:Object,
+        default:()=>{}
+    }
+});
+
+/**
+ * 绘制图表
+ */
+const createChart = () => {
+    nextTick(() => {
+        const myChart = echarts.init(proxy.$refs.chart);
+        myChart.setOption(props.options);
+        window.addEventListener('resize', function () {
+            myChart.resize();
+        });
+    });
+};
+
+watch(
+    () => props.options,
+    () => createChart(),
+    { immediate: true, deep: true },
+);
+</script>
+
+<style scoped lang="less">
+.chart {
+    width: 100%;
+    height: 100%;
+}
+</style>
diff --git a/src/views/rule-engine/DashBoard/components/Guide.vue b/src/views/rule-engine/DashBoard/components/Guide.vue
new file mode 100644
index 00000000..c423d252
--- /dev/null
+++ b/src/views/rule-engine/DashBoard/components/Guide.vue
@@ -0,0 +1,60 @@
+<template>
+    <div class="home-title">
+        <div v-if="title">{{ title }}</div>
+        <div v-else class="title">
+            <slot name="title"></slot>
+        </div>
+        <div class="extra-text">
+            <slot name="extra"></slot>
+        </div>
+        <div class="home-title-english">{{ english }}</div>
+    </div>
+</template>
+
+<script setup lang="ts" name="Guide">
+interface guideProps {
+    title?: string;
+    english?: string;
+}
+
+const props = defineProps<guideProps>();
+</script>
+
+<style scoped lang="less">
+.home-title {
+    position: relative;
+    z-index: 2;
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 12px;
+    padding-left: 18px;
+    font-weight: 700;
+    font-size: 18px;
+    &::after {
+        position: absolute;
+        top: 50%;
+        left: 0;
+        width: 8px;
+        height: 8px;
+        background-color: @primary-color;
+        border: 1px solid #b4c0da;
+        transform: translateY(-50%);
+        content: ' ';
+    }
+
+    .extra-text {
+        font-size: 14px;
+        font-weight: 400;
+    }
+    .title{
+        flex: 1;
+    }
+
+    .home-title-english {
+        position: absolute;
+        top: 30px;
+        color: rgba(0, 0, 0, 0.3);
+        font-size: 12px;
+    }
+}
+</style>
diff --git a/src/views/rule-engine/DashBoard/components/NewAlarm.vue b/src/views/rule-engine/DashBoard/components/NewAlarm.vue
new file mode 100644
index 00000000..6c7125d8
--- /dev/null
+++ b/src/views/rule-engine/DashBoard/components/NewAlarm.vue
@@ -0,0 +1,152 @@
+<template>
+    <div class="new-alarm">
+        <div class="title">最新警告</div>
+        <div v-if="alarmList.length" class="new-alarm-items">
+            <ul>
+                <li v-for="item in alarmList.slice(0, 3)" :key="item">
+                    <div class="new-alarm-item">
+                        <div class="new-alarm-item-time">
+                            <img
+                                :src="getImage('/alarm/bashboard.png')"
+                                alt=""
+                            />{{
+                                moment(item.alarmTime).format(
+                                    'YYYY-MM-DD HH:mm:ss',
+                                )
+                            }}
+                        </div>
+                        <div class="new-alarm-item-content">
+                            <a-tooltip
+                                :title="item.alarmName"
+                                placement="topLeft"
+                            >
+                                <a>{{ item.alarmName }}</a>
+                            </a-tooltip>
+                        </div>
+                        <div class="new-alarm-item-state">
+                            <a-badge
+                                :status="
+                                    item.state?.value === 'warning'
+                                        ? 'error'
+                                        : 'default'
+                                "
+                            >
+                            </a-badge>
+                            <span
+                                :class="
+                                    item.state?.value === 'warning'
+                                        ? 'error'
+                                        : 'default'
+                                "
+                            >
+                                {{ item.state?.text }}
+                            </span>
+                        </div>
+                        <div
+                            :class="[
+                                'new-alarm-item-level',
+                                `level-${item.level}`,
+                            ]"
+                        >
+                            {{ item.levelName }}
+                        </div>
+                    </div>
+                </li>
+            </ul>
+        </div>
+        <div v-else class="empty-body">
+            <a-empty :image="Empty.PRESENTED_IMAGE_SIMPLE"></a-empty>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { Empty } from 'ant-design-vue';
+import { getImage } from '@/utils/comm';
+import moment from 'moment';
+const props = defineProps({
+    alarmList: {
+        type: Array,
+        default: [],
+    },
+});
+</script>
+<style scoped lang="less">
+.new-alarm {
+    background-color: white;
+    padding: 24px;
+    background-color: #fff;
+    border: 1px solid #e0e4e8;
+    border-radius: 2px;
+}
+.new-alarm-items {
+    ul {
+        list-style: none;
+        padding: 0;
+    }
+    .new-alarm-item {
+        display: flex;
+        gap: 12px;
+        margin: 18px 0;
+        font-size: 12px;
+        .new-alarm-item-time {
+            width: 180px;
+            font-size: 14px;
+
+            > img {
+                margin-right: 8px;
+            }
+        }
+    }
+    .new-alarm-item-content {
+        width: ~'calc(100% - 360px)';
+    }
+    .new-alarm-item-state {
+        width: 90px;
+        text-align: center;
+        font-size: 14px;
+        .error {
+            color: @error-color;
+        }
+
+        .default {
+            color: @text-color;
+        }
+    }
+    .new-alarm-item-level {
+        width: 52px;
+        padding: 2px 8px;
+        color: #fff;
+        text-align: center;
+        border-radius: 2px;
+
+        &.level-1 {
+            background-color: #e50012;
+        }
+
+        &.level-2 {
+            background-color: #ff9457;
+        }
+
+        &.level-3 {
+            background-color: #fabd47;
+        }
+
+        &.level-4 {
+            background-color: #999;
+        }
+
+        &.level-5 {
+            background-color: #bbb;
+        }
+    }
+}
+.empty-body {
+    height: 142px;
+    display: flex;
+    flex-direction: column;
+    align-content: center;
+    justify-content: center;
+    width: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/DashBoard/components/TimeSelect.vue b/src/views/rule-engine/DashBoard/components/TimeSelect.vue
new file mode 100644
index 00000000..eaa86387
--- /dev/null
+++ b/src/views/rule-engine/DashBoard/components/TimeSelect.vue
@@ -0,0 +1,117 @@
+<template>
+    <div>
+        <a-radio-group
+            v-if="quickBtn"
+            default-value="today"
+            button-style="solid"
+            v-model:value="radioValue"
+            @change="(e) => handleBtnChange(e.target.value)"
+        >
+            <a-radio-button
+                v-for="item in quickBtnList"
+                :key="item.value"
+                :value="item.value"
+            >
+                {{ item.label }}
+            </a-radio-button>
+        </a-radio-group>
+        <a-range-picker
+            format="YYYY-MM-DD HH:mm:ss"
+            valueFormat="YYYY-MM-DD HH:mm:ss"
+            style="margin-left: 12px"
+            @change="rangeChange"
+            v-model:value="rangeVal"
+            :allowClear="false"
+        >
+        </a-range-picker>
+    </div>
+</template>
+
+<script setup lang="ts">
+import moment from 'moment';
+import { PropType } from 'vue';
+
+interface BtnOptions {
+    label: string;
+    value: string;
+}
+
+interface EmitProps {
+    (e: 'change', data: Record<string, any>): void;
+}
+
+const emit = defineEmits<EmitProps>();
+
+const props = defineProps({
+    // 显示快捷按钮
+    quickBtn: {
+        type: Boolean,
+        default: true,
+    },
+    // 快捷按钮列表
+    quickBtnList: {
+        type: Array as PropType<BtnOptions[]>,
+        default: [
+            { label: '今日', value: 'today' },
+            { label: '近一周', value: 'week' },
+            { label: '近一月', value: 'month' },
+            { label: '近一年', value: 'year' },
+        ],
+    },
+    type: {
+        type: String,
+        default: 'today',
+    },
+});
+
+const radioValue = ref(props.type || 'week' || undefined);
+const rangeVal = ref<[string, string]>();
+
+const rangeChange = (val: any) => {
+    radioValue.value = undefined;
+    emit('change', {
+        start: moment(val[0]).valueOf(),
+        end: moment(val[1]).valueOf(),
+        type: undefined,
+    });
+};
+
+const getTimeByType = (type: string) => {
+    switch (type) {
+        case 'hour':
+            return moment().subtract(1, 'hours').valueOf();
+        case 'week':
+            return moment().subtract(6, 'days').valueOf();
+        case 'month':
+            return moment().subtract(29, 'days').valueOf();
+        case 'year':
+            return moment().subtract(365, 'days').valueOf();
+        default:
+            return moment().startOf('day').valueOf();
+    }
+};
+
+const handleBtnChange = (val: string) => {
+    radioValue.value = val;
+    let endTime = moment(new Date()).valueOf();
+    let startTime = getTimeByType(val);
+    if (val === 'yesterday') {
+        startTime = moment().subtract(1, 'days').startOf('day').valueOf();
+        endTime = moment().subtract(1, 'days').endOf('day').valueOf();
+    }
+    rangeVal.value = [
+        moment(startTime).format('YYYY-MM-DD HH:mm:ss'),
+        moment(endTime).format('YYYY-MM-DD HH:mm:ss'),
+    ];
+    emit('change', {
+        start: startTime,
+        end: endTime,
+        type: val,
+    });
+};
+handleBtnChange(radioValue.value);
+watch(
+    () => radioValue.value,
+    { deep: true, immediate: true },
+);
+</script>
diff --git a/src/views/rule-engine/DashBoard/components/TopCard.vue b/src/views/rule-engine/DashBoard/components/TopCard.vue
new file mode 100644
index 00000000..13c5fcac
--- /dev/null
+++ b/src/views/rule-engine/DashBoard/components/TopCard.vue
@@ -0,0 +1,106 @@
+<template>
+    <div class="top-card">
+        <div class="top-card-content">
+            <div class="content-left">
+                <div class="content-left-title">
+                    <span>{{ title }}</span>
+                    <a-tooltip placement="top" v-if="tooltip">
+                        <template #title>
+                            <span>{{ tooltip }}</span>
+                        </template>
+                        <AIcon type="QuestionCircleOutlined" />
+                    </a-tooltip>
+                </div>
+                <div class="content-left-value">{{ value }}</div>
+            </div>
+            <div class="content-right" v-if="img">
+                <img :src="img" alt="" />
+            </div>
+            <div class="content-right-echart" v-else>
+                <slot></slot>
+            </div>
+        </div>
+        <div class="top-card-footer">
+            <template v-for="(item, index) in footer" :key="index">
+                <span v-if="!item.status">{{ item.title }}</span>
+                <a-badge v-else :text="item.title" :status="item.status" />
+                <div class="footer-item-value">{{ item.value }}</div>
+            </template>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue';
+import type { Footer } from '@/views/device/DashBoard/typings'
+
+const props = defineProps({
+    title: { type: String, default: '' },
+    tooltip: { type: String, default: '' },
+    img: { type: String, default: '' },
+    footer: { type: Array as PropType<Footer[]>, default: '' },
+    value: { type: Number, default: 0 },
+});
+</script>
+
+<style lang="less" scoped>
+.top-card {
+    display: flex;
+    flex-direction: column;
+    // height: 200px;
+    padding: 24px;
+    background-color: #fff;
+    border: 1px solid #e0e4e8;
+    border-radius: 2px;
+    .top-card-content {
+        display: flex;
+        flex-direction: row;
+        flex-grow: 1;
+        justify-content: space-between;
+        .content-left {
+            height: 100%;
+            width: 50%;
+            &-title {
+                color: rgba(0, 0, 0, 0.64);
+            }
+            &-value {
+                padding: 12px 0;
+                color: #323130;
+                font-weight: 700;
+                font-size: 36px;
+            }
+        }
+        .content-right {
+            width: 0;
+            height: 123px;
+            display: flex;
+            flex-grow: .7;
+            align-items: flex-end;
+            justify-content: flex-end;
+            img {
+                width: 100%;
+                height: 100%;
+            }
+        }
+        .content-right-echart{
+            height: 123px;
+            display: flex;
+            flex-grow: 1;
+            align-items: flex-end;
+            justify-content: flex-end;
+        }
+    }
+    .top-card-footer {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding-top: 16px;
+        border-top: 1px solid #f0f0f0;
+        .footer-item-value {
+            color: #323130;
+            font-weight: 700;
+            font-size: 16px;
+        }
+    }
+}
+</style>
diff --git a/src/views/rule-engine/DashBoard/index.vue b/src/views/rule-engine/DashBoard/index.vue
new file mode 100644
index 00000000..b07a1130
--- /dev/null
+++ b/src/views/rule-engine/DashBoard/index.vue
@@ -0,0 +1,547 @@
+<template>
+    <page-container>
+        <div class="DashBoardBox">
+            <a-row :gutter="24">
+                <a-col :span="6">
+                    <TopCard
+                        title="今日告警"
+                        :value="state.today"
+                        :footer="currentMonAlarm"
+                    >
+                        <Charts :options="state.fifteenOptions"></Charts>
+                    </TopCard>
+                </a-col>
+                <a-col :span="6">
+                    <TopCard
+                        title="告警配置"
+                        :value="state.config"
+                        :footer="alarmState"
+                        :img="getImage('/device/device-number.png')"
+                    ></TopCard>
+                </a-col>
+                <a-col :span="12">
+                    <NewAlarm :alarm-list="state.alarmList"></NewAlarm>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="24">
+                    <div class="alarm-card">
+                        <Guide>
+                            <template #title>
+                                <span style="margin-right: 24px">告警统计</span>
+                                <a-select
+                                    style="width: 40%"
+                                    v-model:value="queryCodition.targetType"
+                                    :options="
+                                        isNoCommunity ? selectOpt1 : selectOpt2
+                                    "
+                                    @change="selectChange"
+                                ></a-select>
+                            </template>
+                            <template #extra>
+                                <TimeSelect
+                                    key="flow-static"
+                                    :type="'week'"
+                                    :quickBtnList="quickBtnList"
+                                    @change="initQueryTime"
+                                />
+                            </template>
+                        </Guide>
+                        <div class="alarmBox">
+                            <div class="alarmStatistics-chart">
+                                <Charts
+                                    :options="alarmStatisticsOption"
+                                ></Charts>
+                            </div>
+                            <div class="alarmRank">
+                                <h4>告警排名</h4>
+                                <ul v-if="state.ranking.length" class="rankingList">
+                                    <li v-for="(item,i) in state.ranking" :key="item.targetId">
+                                        <img :src="getImage(`/rule-engine/dashboard/ranking/${i+1}.png`)" alt="">
+                                        <span class="rankingItemTitle" :title="item.targetName">{{item.targetName}}</span>
+                                        <span class="rankingItemValue">{{item.count}}</span>
+                                    </li>
+                                </ul>
+                                <div v-else class="empty-body">
+                                    <a-empty  :image="Empty.PRESENTED_IMAGE_SIMPLE"></a-empty>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </a-col>
+            </a-row>
+        </div>
+    </page-container>
+</template>
+
+<script lang="ts" setup>
+import { Empty } from 'ant-design-vue';
+import { getImage } from '@/utils/comm';
+import Charts from './components/Charts.vue';
+import TopCard from './components/TopCard.vue';
+import NewAlarm from './components/NewAlarm.vue';
+import TimeSelect from './components/TimeSelect.vue';
+import Guide from './components/Guide.vue';
+import encodeQuery from '@/utils/encodeQuery';
+import type { SelectTypes } from 'ant-design-vue/es/select';
+import type { Footer } from '@/views/rule-engine/DashBoard/typings';
+import { isNoCommunity } from '@/utils/utils';
+import {
+    dashboard,
+    getAlarm,
+    getAlarmConfigCount,
+    getAlarmLevel,
+} from '@/api/rule-engine/dashboard';
+import moment from 'moment';
+let currentMonAlarm = ref<Footer[]>([
+    {
+        title: '当月告警',
+        value: 0,
+        status: 'success',
+    },
+]);
+let alarmState = ref<Footer[]>([
+    {
+        title: '正常',
+        value: 0,
+        status: 'success',
+    },
+    {
+        title: '禁用',
+        value: 0,
+        status: 'error',
+    },
+]);
+const selectOpt1 = ref<Object[]>([
+    { label: '设备', value: 'device' },
+    { label: '产品', value: 'product' },
+    { label: '组织', value: 'org' },
+    { label: '其它', value: 'other' },
+]);
+const selectOpt2 = ref<SelectTypes['options']>([
+    { label: '设备', value: 'device' },
+    { label: '产品', value: 'product' },
+    { label: '其它', value: 'other' },
+]);
+let queryCodition = reactive({
+    startTime: 0,
+    endTime: 0,
+    targetType: 'device',
+});
+let alarmStatisticsOption = ref<any>({});
+const quickBtnList = [
+    { label: '昨日', value: 'yesterday' },
+    { label: '近一周', value: 'week' },
+    { label: '近一月', value: 'month' },
+    { label: '近一年', value: 'year' },
+];
+type DashboardItem = {
+    group: string;
+    data: Record<string, any>;
+};
+let state = reactive<{
+    today: number;
+    thisMonth: number;
+    config: number;
+    enabledConfig: number;
+    disabledConfig: number;
+    alarmList: any[];
+    ranking: { targetId: string; targetName: string; count: number }[];
+    fifteenOptions: any;
+}>({
+    today: 0,
+    thisMonth: 0,
+    config: 0,
+    enabledConfig: 0,
+    disabledConfig: 0,
+    alarmList: [],
+    ranking: [],
+    fifteenOptions: {},
+});
+// 今日告警
+const today = {
+    dashboard: 'alarm',
+    object: 'record',
+    measurement: 'trend',
+    dimension: 'agg',
+    group: 'today',
+    params: {
+        time: '1d',
+        // targetType: 'device',
+        format: 'HH:mm:ss',
+        from: moment(new Date(new Date().setHours(0, 0, 0, 0))).format(
+            'YYYY-MM-DD HH:mm:ss',
+        ),
+        to: 'now',
+        // limit: 24,
+    },
+};
+// 当月告警
+const thisMonth = {
+    dashboard: 'alarm',
+    object: 'record',
+    measurement: 'trend',
+    dimension: 'agg',
+    group: 'thisMonth',
+    params: {
+        time: '1M',
+        // targetType: 'device',
+        format: 'yyyy-MM',
+        limit: 1,
+        from: 'now-1M',
+    },
+};
+
+const fifteen = {
+    dashboard: 'alarm',
+    object: 'record',
+    measurement: 'trend',
+    dimension: 'agg',
+    group: '15day',
+    params: {
+        time: '1d',
+        format: 'yyyy-MM-dd',
+        // targetType: 'product',
+        from: 'now-15d',
+        to: 'now',
+        limit: 15,
+    },
+};
+const getDashBoard = () => {
+    dashboard([today, thisMonth, fifteen]).then((res) => {
+        if (res.status == 200) {
+            const _data = res.result as DashboardItem[];
+            state.today = _data.find(
+                (item) => item.group === 'today',
+            )?.data.value;
+            state.thisMonth = _data.find(
+                (item) => item.group === 'thisMonth',
+            )?.data.value;
+            currentMonAlarm.value[0].value = state.thisMonth;
+            const fifteenData = _data
+                .filter((item) => item.group === '15day')
+                .map((item) => item.data)
+                .sort((a, b) => b.timestamp - a.timestamp);
+            state.fifteenOptions = {
+                xAxis: {
+                    type: 'category',
+                    data: fifteenData.map((item) => item.timeString),
+                    show: false,
+                },
+                yAxis: {
+                    type: 'value',
+                    show: false,
+                },
+                grid: {
+                    top: '2%',
+                    bottom: 0,
+                },
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'shadow',
+                    },
+                },
+                series: [
+                    {
+                        name: '告警数',
+                        data: fifteenData.map((item) => item.value),
+                        type: 'bar',
+                        itemStyle: {
+                            color: '#2F54EB',
+                        },
+                    },
+                ],
+            };
+        }
+    });
+};
+getDashBoard();
+const getAlarmConfig = async () => {
+    const countRes = await getAlarmConfigCount({});
+    const enabeldRes = await getAlarmConfigCount({
+        terms: [
+            {
+                column: 'state',
+                value: 'enabled',
+            },
+        ],
+    });
+    const disableRes = await getAlarmConfigCount({
+        terms: [
+            {
+                column: 'state',
+                value: 'disabled',
+            },
+        ],
+    });
+    if (countRes.status == 200) {
+        state.config = countRes.result;
+    }
+    if (enabeldRes.status == 200) {
+        state.enabledConfig = enabeldRes.result;
+        alarmState.value[0].value = state.enabledConfig;
+    }
+    if (disableRes.status == 200) {
+        state.disabledConfig = disableRes.result;
+        alarmState.value[1].value = state.disabledConfig;
+    }
+};
+getAlarmConfig();
+const getCurrentAlarm = async () => {
+    const alarmLevel: any = await getAlarmLevel();
+    const sorts = { alarmTime: 'desc' };
+    const currentAlarm: any = await getAlarm(encodeQuery({ sorts }));
+    if (currentAlarm.status === 200) {
+        if (alarmLevel.status === 200) {
+            const levels = alarmLevel.result.levels;
+            state.alarmList = currentAlarm.result?.data
+                .filter((i: any) => i?.state?.value === 'warning')
+                .map((item: { level: any }) => ({
+                    ...item,
+                    levelName: levels.find((l: any) => l.level === item.level)
+                        ?.title,
+                }));
+        } else {
+            state.alarmList = currentAlarm.result?.data.filter(
+                (item: any) => item?.state?.value === 'warning',
+            );
+        }
+    }
+};
+getCurrentAlarm();
+//初始化查询条件
+const initQueryTime = (data: any) => {
+    queryCodition.startTime = data.start;
+    queryCodition.endTime = data.end;
+    console.log(queryCodition);
+    selectChange();
+};
+const selectChange = () => {
+    let time = '1h';
+    let format = 'HH';
+    let limit = 12;
+    const dt = queryCodition.endTime - queryCodition.startTime;
+    const hour = 60 * 60 * 1000;
+    const day = hour * 24;
+    const month = day * 30;
+    const year = 365 * day;
+    if (dt <= day) {
+        limit = Math.abs(Math.ceil(dt / hour));
+    } else if (dt > day && dt < year) {
+        limit = Math.abs(Math.ceil(dt / day)) + 1;
+        time = '1d';
+        format = 'M月dd日';
+    } else if (dt >= year) {
+        limit = Math.abs(Math.floor(dt / month));
+        time = '1M';
+        format = 'yyyy年-M月';
+    }
+
+    // 告警趋势
+    const chartData = {
+        dashboard: 'alarm',
+        object: 'record',
+        measurement: 'trend',
+        dimension: 'agg',
+        group: 'alarmTrend',
+        params: {
+            targetType: queryCodition.targetType, // product、device、org、other
+            format: format,
+            time: time,
+            // from: 'now-1y', // now-1d、now-1w、now-1M、now-1y
+            // to: 'now',
+            limit: limit, // 12
+            // time: params.time.type === 'today' ? '1h' : '1d',
+            from: moment(queryCodition.startTime).format('YYYY-MM-DD HH:mm:ss'),
+            to: moment(queryCodition.endTime).format('YYYY-MM-DD HH:mm:ss'),
+            // limit: 30,
+        },
+    };
+
+    // 告警排名
+    const order = {
+        dashboard: 'alarm',
+        object: 'record',
+        measurement: 'rank',
+        dimension: 'agg',
+        group: 'alarmRank',
+        params: {
+            // time: '1h',
+            time: time,
+            targetType: queryCodition.targetType,
+            from: moment(queryCodition.startTime).format('YYYY-MM-DD HH:mm:ss'),
+            to: moment(queryCodition.endTime).format('YYYY-MM-DD HH:mm:ss'),
+            limit: 9,
+        },
+    };
+    let tip = '其它';
+    if (queryCodition.targetType === 'device') {
+        tip = '设备';
+    } else if (queryCodition.targetType === 'product') {
+        tip = '产品';
+    } else if (queryCodition.targetType === 'org') {
+        tip = '组织';
+    }
+    // 网络请求
+    dashboard([chartData, order]).then((res) => {
+        if (res.status == 200) {
+            const xData: string[] = [];
+            const sData: number[] = [];
+            res.result
+                .filter((item: any) => item.group === 'alarmTrend')
+                .forEach((item: any) => {
+                    xData.push(item.data.timeString);
+                    sData.push(item.data.value);
+                });
+            alarmStatisticsOption.value = {
+                xAxis: {
+                    type: 'category',
+                    boundaryGap: false,
+                    data: xData.reverse(),
+                },
+                yAxis: {
+                    type: 'value',
+                },
+                tooltip: {
+                    trigger: 'axis',
+                    // axisPointer: {
+                    //   type: 'shadow',
+                    // },
+                },
+                grid: {
+                    top: '2%',
+                    bottom: '5%',
+                    left: '24px',
+                    right: '48px',
+                },
+                series: [
+                    {
+                        name: tip,
+                        data: sData.reverse(),
+                        type: 'line',
+                        smooth: true,
+                        color: '#685DEB',
+                        areaStyle: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 0,
+                                y2: 1,
+                                colorStops: [
+                                    {
+                                        offset: 0,
+                                        color: '#685DEB', // 100% 处的颜色
+                                    },
+                                    {
+                                        offset: 1,
+                                        color: '#FFFFFF', //   0% 处的颜色
+                                    },
+                                ],
+                                global: false, // 缺省为 false
+                            },
+                        },
+                    },
+                ],
+            };
+            state.ranking = res.result
+                ?.filter((item: any) => item.group === 'alarmRank')
+                .map((d: { data: { value: any } }) => d.data?.value)
+                .sort(
+                    (a: { count: number }, b: { count: number }) =>
+                        b.count - a.count,
+                );
+        }
+    });
+};
+</script>
+<style scoped lang="less">
+.alarm-card {
+    width: 100%;
+    background-color: white;
+    padding: 24px;
+    margin-top: 24px;
+}
+.alarmBox {
+    width: 100%;
+    display: flex;
+    .alarmStatistics-chart {
+        width: 70%;
+        height: 500px;
+    }
+    .alarmRank {
+        position: relative;
+        width: 30%;
+        padding-left: 48px;
+    }
+}
+.rankingList {
+    margin: 25px 0 0;
+    padding: 0;
+    list-style: none;
+
+    li {
+        display: flex;
+        align-items: center;
+        margin-top: 16px;
+        zoom: 1;
+
+        &::before,
+        &::after {
+            display: table;
+            content: ' ';
+        }
+
+        &::after {
+            clear: both;
+            height: 0;
+            font-size: 0;
+            visibility: hidden;
+        }
+
+        span {
+            //color: red;
+            font-size: 14px;
+            line-height: 22px;
+        }
+
+        .rankingItemNumber {
+            display: inline-block;
+            width: 20px;
+            height: 20px;
+            margin-top: 1.5px;
+            margin-right: 16px;
+            font-weight: 600;
+            font-size: 12px;
+            line-height: 20px;
+            text-align: center;
+            background-color: #edf0f3;
+            border-radius: 20px;
+
+            &.active {
+                color: #fff;
+                background-color: #314659;
+            }
+        }
+
+        .rankingItemTitle {
+            flex: 1;
+            margin-right: 8px;
+            padding-left: 8px;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+    }
+}
+.empty-body {
+        height: 490px;
+        display: flex;
+        flex-direction: column;
+        align-content: center;
+        justify-content: center;
+        width: 100%;
+        // height: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/DashBoard/typings.d.ts b/src/views/rule-engine/DashBoard/typings.d.ts
new file mode 100644
index 00000000..87e0dde4
--- /dev/null
+++ b/src/views/rule-engine/DashBoard/typings.d.ts
@@ -0,0 +1,5 @@
+export type Footer = {
+    title: string;
+    value: number | string;
+    status?: "default" | "error" | "success" | "warning" | "processing"
+}
\ No newline at end of file
diff --git a/vite.config.ts b/vite.config.ts
index 9c86c17e..3fca4903 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -82,8 +82,8 @@ export default defineConfig(({ mode}) => {
                   // target: 'http://192.168.33.22:8800',
                   // target: 'http://192.168.32.244:8881',
                 //   target: 'http://47.112.135.104:5096', // opcua
-                //   target: 'http://120.77.179.54:8844', // 120测试
-                  target: 'http://47.108.63.174:8845', // 测试
+                  target: 'http://120.77.179.54:8844', // 120测试
+                //   target: 'http://47.108.63.174:8845', // 测试
                   changeOrigin: true,
                   rewrite: (path) => path.replace(/^\/api/, '')
               }

From 693c9d3311d4348cef2ecc39ea27af983d546015 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 16 Feb 2023 16:13:23 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat:=20=E8=A7=86=E9=A2=91=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83-=E8=A7=86=E9=A2=91=E8=AE=BE=E5=A4=87=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/media/device.ts               |  13 +
 src/components/AIcon/index.tsx        |   5 +-
 src/views/media/Device/Save/index.vue |   7 +
 src/views/media/Device/index.vue      | 334 ++++++++++++++++++++++++++
 src/views/media/Device/typings.d.ts   |  24 ++
 5 files changed, 382 insertions(+), 1 deletion(-)
 create mode 100644 src/api/media/device.ts
 create mode 100644 src/views/media/Device/Save/index.vue
 create mode 100644 src/views/media/Device/index.vue
 create mode 100644 src/views/media/Device/typings.d.ts

diff --git a/src/api/media/device.ts b/src/api/media/device.ts
new file mode 100644
index 00000000..d16d117e
--- /dev/null
+++ b/src/api/media/device.ts
@@ -0,0 +1,13 @@
+import server from '@/utils/request'
+
+export default {
+    // 列表
+    list: (data: any) => server.post(`/media/device/_query/`, data),
+    // 详情
+    detail: (id: string): any => server.get(`/media/device/${id}`),
+    // 新增
+    save: (data: any) => server.post(`/media/device/${data.channel}`, data),
+    // 修改
+    update: (data: any) => server.put(`/media/device/${data.channel}/${data.id}`, data),
+    del: (id: string) => server.remove(`/media/device/${id}`),
+}
\ No newline at end of file
diff --git a/src/components/AIcon/index.tsx b/src/components/AIcon/index.tsx
index 7a8a21b3..4ebea3b2 100644
--- a/src/components/AIcon/index.tsx
+++ b/src/components/AIcon/index.tsx
@@ -45,7 +45,10 @@ const iconKeys = [
     'InfoCircleOutlined',
     'SearchOutlined',
     'EllipsisOutlined',
-    'ClockCircleOutlined'
+    'ClockCircleOutlined',
+    'PartitionOutlined',
+    'ShareAltOutlined',
+    'playCircleOutlined',
 ]
 
 const Icon = (props: {type: string}) => {
diff --git a/src/views/media/Device/Save/index.vue b/src/views/media/Device/Save/index.vue
new file mode 100644
index 00000000..e84d2a3b
--- /dev/null
+++ b/src/views/media/Device/Save/index.vue
@@ -0,0 +1,7 @@
+<template>
+    <div class="page-container">save</div>
+</template>
+
+<script setup lang="ts"></script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/media/Device/index.vue b/src/views/media/Device/index.vue
new file mode 100644
index 00000000..141caa50
--- /dev/null
+++ b/src/views/media/Device/index.vue
@@ -0,0 +1,334 @@
+<template>
+    <div class="page-container">
+        <Search
+            :columns="columns"
+            target="notice-config"
+            @search="handleSearch"
+        />
+        <JTable
+            ref="listRef"
+            :columns="columns"
+            :request="DeviceApi.list"
+            :defaultParams="{
+                sorts: [{ name: 'createTime', order: 'desc' }],
+            }"
+            :params="params"
+        >
+            <template #headerTitle>
+                <a-button type="primary" @click="handleAdd"> 新增 </a-button>
+            </template>
+            <template #card="slotProps">
+                <CardBox
+                    :value="slotProps"
+                    :actions="getActions(slotProps, 'card')"
+                    v-bind="slotProps"
+                    :showStatus="true"
+                    :status="
+                        slotProps.state.value === 'online' ? 'success' : 'error'
+                    "
+                    :statusText="slotProps.state.text"
+                    :statusNames="{ success: 'success', error: 'error' }"
+                >
+                    <template #img>
+                        <slot name="img">
+                            <img :src="getImage('/device-media.png')" />
+                        </slot>
+                    </template>
+                    <template #content>
+                        <h3 class="card-item-content-title">
+                            {{ slotProps.name }}
+                        </h3>
+                        <a-row>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">厂商</div>
+                                <div>{{ slotProps.manufacturer }}</div>
+                            </a-col>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">
+                                    通道数量
+                                </div>
+                                <div>{{ slotProps.channelNumber }}</div>
+                            </a-col>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">型号</div>
+                                <div>{{ slotProps.model }}</div>
+                            </a-col>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">
+                                    接入方式
+                                </div>
+                                <div>
+                                    {{ providerType[slotProps.provider] }}
+                                </div>
+                            </a-col>
+                        </a-row>
+                    </template>
+                    <template #actions="item">
+                        <a-tooltip
+                            v-bind="item.tooltip"
+                            :title="item.disabled && item.tooltip.title"
+                        >
+                            <a-popconfirm
+                                v-if="item.popConfirm"
+                                v-bind="item.popConfirm"
+                                :disabled="item.disabled"
+                            >
+                                <a-button :disabled="item.disabled">
+                                    <AIcon type="DeleteOutlined" />
+                                </a-button>
+                            </a-popconfirm>
+                            <template v-else>
+                                <a-button
+                                    :disabled="item.disabled"
+                                    @click="item.onClick"
+                                >
+                                    <AIcon :type="item.icon" />
+                                    <span>{{ item.text }}</span>
+                                </a-button>
+                            </template>
+                        </a-tooltip>
+                    </template>
+                </CardBox>
+            </template>
+            <template #action="slotProps">
+                <a-space :size="16">
+                    <a-tooltip
+                        v-for="i in getActions(slotProps, 'table')"
+                        :key="i.key"
+                        v-bind="i.tooltip"
+                    >
+                        <a-popconfirm
+                            v-if="i.popConfirm"
+                            v-bind="i.popConfirm"
+                            :disabled="i.disabled"
+                        >
+                            <a-button
+                                :disabled="i.disabled"
+                                style="padding: 0"
+                                type="link"
+                                ><AIcon :type="i.icon"
+                            /></a-button>
+                        </a-popconfirm>
+                        <a-button
+                            style="padding: 0"
+                            type="link"
+                            v-else
+                            @click="i.onClick && i.onClick(slotProps)"
+                        >
+                            <a-button
+                                :disabled="i.disabled"
+                                style="padding: 0"
+                                type="link"
+                                ><AIcon :type="i.icon"
+                            /></a-button>
+                        </a-button>
+                    </a-tooltip>
+                </a-space>
+            </template>
+        </JTable>
+    </div>
+</template>
+
+<script setup lang="ts">
+import DeviceApi from '@/api/media/device';
+import type { ActionsType } from '@/components/Table/index.vue';
+import { message } from 'ant-design-vue';
+import { getImage } from '@/utils/comm';
+
+const providerType = {
+    'gb28181-2016': 'GB/T28181',
+    'fixed-media': '固定地址',
+};
+
+const router = useRouter();
+
+const listRef = ref<Record<string, any>>({});
+const params = ref<Record<string, any>>({});
+
+const columns = [
+    {
+        title: 'ID',
+        dataIndex: 'id',
+        key: 'id',
+        search: {
+            type: 'string',
+        },
+    },
+    {
+        title: '名称',
+        dataIndex: 'name',
+        key: 'name',
+        search: {
+            type: 'string',
+        },
+    },
+    {
+        title: '接入方式',
+        dataIndex: 'type',
+        key: 'type',
+        scopedSlots: true,
+        search: {
+            type: 'select',
+            options: [
+                { label: '固定地址', value: 'fixed-media' },
+                { label: 'GB/T28181', value: 'gb28181-2016' },
+            ],
+            handleValue: (v: any) => {
+                return '123';
+            },
+        },
+    },
+    {
+        title: '通道数量',
+        dataIndex: 'channelNumber',
+        key: 'channelNumber',
+    },
+    {
+        title: '厂商',
+        dataIndex: 'manufacturer',
+        key: 'manufacturer',
+        search: {
+            type: 'string',
+        },
+    },
+    {
+        title: '产品名称',
+        dataIndex: 'productId',
+        key: 'productId',
+        scopedSlots: true,
+        search: {
+            type: 'select',
+            options: [
+                { label: '固定地址', value: 'fixed-media' },
+                { label: 'GB/T28181', value: 'gb28181-2016' },
+            ],
+            handleValue: (v: any) => {
+                return '123';
+            },
+        },
+    },
+    {
+        title: '状态',
+        dataIndex: 'state',
+        key: 'state',
+        scopedSlots: true,
+        search: {
+            type: 'select',
+            options: [
+                { label: '禁用', value: 'notActive' },
+                { label: '离线', value: 'offline' },
+                { label: '在线', value: 'online' },
+            ],
+            handleValue: (v: any) => {
+                return '123';
+            },
+        },
+    },
+    {
+        title: '操作',
+        key: 'action',
+        fixed: 'right',
+        width: 250,
+        scopedSlots: true,
+    },
+];
+
+/**
+ * 搜索
+ * @param params
+ */
+const handleSearch = (e: any) => {
+    // console.log('handleSearch:', e);
+    params.value = e;
+};
+
+/**
+ * 新增
+ */
+const handleAdd = () => {
+    router.push(`/media/device/Save`);
+};
+
+const getActions = (
+    data: Partial<Record<string, any>>,
+    type: 'card' | 'table',
+): ActionsType[] => {
+    if (!data) return [];
+    const actions = [
+        {
+            key: 'edit',
+            text: '编辑',
+            tooltip: {
+                title: '编辑',
+            },
+            icon: 'EditOutlined',
+            onClick: () => {
+                router.push(`/media/device/Save?id=${data.id}`);
+            },
+        },
+        {
+            key: 'view',
+            text: '查看通道',
+            tooltip: {
+                title: '查看通道',
+            },
+            icon: 'PartitionOutlined',
+            onClick: () => {
+                router.push(
+                    `/media/device/Channel?id=${data.id}&type=${data.provider}`,
+                );
+            },
+        },
+        {
+            key: 'debug',
+            text: '更新通道',
+            tooltip: {
+                title:
+                    data.provider === 'fixed-media'
+                        ? '固定地址无法更新通道'
+                        : data.state.value === 'offline'
+                        ? '设备已离线'
+                        : data.state.value === 'notActive'
+                        ? '设备已禁用'
+                        : '',
+            },
+            disabled:
+                data.state.value === 'offline' ||
+                data.state.value === 'notActive' ||
+                data.provider === 'fixed-media',
+            icon: 'SyncOutlined',
+            onClick: () => {
+                // updateChannel()
+            },
+        },
+        {
+            key: 'delete',
+            text: '删除',
+            tooltip: {
+                title: '在线设备无法删除',
+            },
+            disabled: data.state.value === 'online',
+            popConfirm: {
+                title: '确认删除?',
+                onConfirm: async () => {
+                    const resp = await DeviceApi.del(data.id);
+                    if (resp.status === 200) {
+                        message.success('操作成功！');
+                        listRef.value?.reload();
+                    } else {
+                        message.error('操作失败！');
+                    }
+                },
+            },
+            icon: 'DeleteOutlined',
+        },
+    ];
+    return actions;
+};
+</script>
+<style lang="less" scoped>
+.page-container {
+    background: #f0f2f5;
+    padding: 24px;
+}
+</style>
diff --git a/src/views/media/Device/typings.d.ts b/src/views/media/Device/typings.d.ts
new file mode 100644
index 00000000..995964b8
--- /dev/null
+++ b/src/views/media/Device/typings.d.ts
@@ -0,0 +1,24 @@
+type BaseItem = {
+    id: string;
+    name: string;
+};
+type State = {
+    value: string;
+    text: string;
+};
+
+export type DeviceItem = {
+    photoUrl?: string;
+    channelNumber: number;
+    createTime: number;
+    firmware: string;
+    gatewayId: string;
+    host: string;
+    manufacturer: string;
+    model: string;
+    port: number;
+    provider: string;
+    state: State;
+    streamMode: string;
+    transport: string;
+} & BaseItem;

From 24690e1cdb1e43728859da49b1b5823fad51355f Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Thu, 16 Feb 2023 16:22:34 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=87=8D=E5=A4=8D=E7=82=B9=E5=87=BB=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PermissionButton/index.vue | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/components/PermissionButton/index.vue b/src/components/PermissionButton/index.vue
index 57268e91..cd95769d 100644
--- a/src/components/PermissionButton/index.vue
+++ b/src/components/PermissionButton/index.vue
@@ -4,14 +4,14 @@
       <a-popconfirm v-bind="popConfirm" @confirm="conform" :disabled="!isPermission || props.disabled">
         <a-tooltip v-if="tooltip" v-bind="tooltip">
           <slot v-if="noButton"></slot>
-          <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" @click="handleClick">
+          <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" >
             <slot></slot>
             <template #icon>
               <slot name="icon"></slot>
             </template>
           </a-button>
         </a-tooltip>
-        <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" @click="handleClick">
+        <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" >
           <slot></slot>
           <template #icon>
             <slot name="icon"></slot>
@@ -22,7 +22,7 @@
     <template v-else-if="tooltip">
       <a-tooltip v-bind="tooltip">
         <slot v-if="noButton"></slot>
-        <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" @click="handleClick">
+        <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" >
           <slot></slot>
           <template #icon>
             <slot name="icon"></slot>
@@ -32,7 +32,7 @@
     </template>
     <template v-else>
       <slot v-if="noButton"></slot>
-      <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" @click="handleClick">
+      <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" >
         <slot></slot>
         <template #icon>
           <slot name="icon"></slot>
@@ -42,7 +42,7 @@
   </template>
   <a-tooltip v-else title="没有权限">
     <slot v-if="noButton"></slot>
-    <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" @click="handleClick">
+    <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" >
       <slot></slot>
       <template #icon>
         <slot name="icon"></slot>
@@ -56,11 +56,11 @@ import { TooltipProps, PopconfirmProps } from 'ant-design-vue/es'
 import { buttonProps } from 'ant-design-vue/es/button/button'
 import { usePermissionStore } from '@/store/permission';
 
-interface PermissionButtonEmits {
-  (e: 'click', data: MouseEvent): void;
-}
+// interface PermissionButtonEmits {
+//   (e: 'click', data: MouseEvent): void;
+// }
 
-const emits = defineEmits<PermissionButtonEmits>()
+// const emits = defineEmits<PermissionButtonEmits>()
 
 // interface PermissionButtonProps extends ButtonProps {
 //   tooltip?: TooltipProps;
@@ -105,9 +105,6 @@ const _isPermission = computed(() =>
       : false
     : true
 )
-const handleClick = (e: MouseEvent) => {
-  emits('click', e)
-}
 
 const conform = (e: MouseEvent) => {
   props.popConfirm?.onConfirm?.(e)