Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

src/views/media/DashBoard/index.vue

@@ -1,31 +1,31 @@
 <template>
     <page-container>
-        <a-row :gutter="24">
+        <j-row :gutter="24">
-            <a-col :span="6">
+            <j-col :span="6">
                 <TopCard
                     title="设备数量"
                     :img="getImage('/media/dashboard-1.png')"
                     :footer="deviceFooter"
                     :value="deviceTotal"
                 />
-            </a-col>
+            </j-col>
-            <a-col :span="6">
+            <j-col :span="6">
                 <TopCard
                     title="通道数量"
                     :img="getImage('/media/dashboard-2.png')"
                     :footer="channelFooter"
                     :value="channelTotal"
                 />
-            </a-col>
+            </j-col>
-            <a-col :span="6">
+            <j-col :span="6">
                 <TopCard
                     title="录像数量"
                     :img="getImage('/media/dashboard-3.png')"
                     :footer="aggFooter"
                     :value="aggTotal"
                 />
-            </a-col>
+            </j-col>
-            <a-col :span="6">
+            <j-col :span="6">
                 <TopCard
                     title="播放中数量"
                     tooltip="当前正在播放的通道数量之和"
@@ -33,15 +33,15 @@
                     :footer="aggPlayingFooter"
                     :value="aggPlayingTotal"
                 />
-            </a-col>
+            </j-col>
-            <a-col :span="24" class="dash-board-bottom">
+            <j-col :span="24" class="dash-board-bottom">
                 <Card
                     title="播放数量(人次)"
                     :chartData="chartData"
                     @change="getPlayCount"
                 />
-            </a-col>
+            </j-col>
-        </a-row>
+        </j-row>
     </page-container>
 </template>
 

src/views/media/Home/components/BasicCountCard.vue

@@ -1,14 +1,11 @@
 <template>
-    <a-card class="device-count-container">
+    <div class="device-count-container">
-        <template #title>
+        <h5 class="title">
-            <h5 class="title">基础统计</h5>
+            <span>基础统计</span>
-        </template>
+            <a style="font-size: 12px;" @click="jumpPage">
-        <template #extra>
+                详情
-            <span style="color: #1d39c4; cursor: pointer" @click="jumpPage"
+            </a>
-                >详情</span
+        </h5>
-            >
-        </template>
-
         <div class="box-list">
             <div class="box-item">
                 <div class="label">设备数量</div>
@@ -21,7 +18,7 @@
                 <img :src="getImage('/home/top-2.png')" alt="" />
             </div>
         </div>
-    </a-card>
+    </div>
 </template>
 
 <script setup lang="ts">
@@ -56,6 +53,8 @@ const jumpPage = () => {
 
 <style lang="less" scoped>
 .device-count-container {
+    background-color: #fff;
+    padding: 24px 14px;
     :deep(.ant-card-body) {
         padding-top: 0;
     }

src/views/media/Home/index.vue

@@ -1,26 +1,26 @@
 <template>
     <page-container>
-        <a-row :gutter="24">
+        <j-row :gutter="24">
-            <a-col :span="14">
+            <j-col :span="14">
                 <BootCard
                     :cardData="deviceBootConfig"
                     cardTitle="视频中心引导"
                 />
-            </a-col>
+            </j-col>
-            <a-col :span="10">
+            <j-col :span="10">
                 <BasicCountCard />
-            </a-col>
+            </j-col>
-            <a-col :span="24" style="margin: 20px 0">
+            <j-col :span="24" style="margin: 20px 0">
                 <PlatformPicCard />
-            </a-col>
+            </j-col>
-            <a-col :span="24">
+            <j-col :span="24">
                 <StepCard
                     cardTitle="设备接入推荐步骤"
                     tooltip="不同的设备因为通信协议的不同，存在接入步骤的差异"
                     :dataList="deviceStepDetails"
                 />
-            </a-col>
+            </j-col>
-        </a-row>
+        </j-row>
     </page-container>
 </template>
 
@@ -40,29 +40,18 @@ const deviceBootConfig: bootConfig[] = [
     {
         english: 'STEP1',
         label: '添加视频设备',
-        link: '/media/device/Save',
+        link: 'media/Device/Save',
-        auth: hasPermission('/media/device/Save'),
+        auth: hasPermission('media/Device:add'),
-        params: {
-            save: true,
-        },
     },
     {
         english: 'STEP2',
         label: '分屏展示',
-        link: '/media/SplitScreen',
+        link: 'media/SplitScreen',
-        auth: hasPermission('/media/SplitScreen'),
-        params: {
-            save: true,
-        },
     },
     {
         english: 'STEP3',
         label: '国标级联',
-        link: '/media/Cascade',
+        link: 'media/Cascade',
-        auth: hasPermission('/media/Cascade'),
-        params: {
-            save: true,
-        },
     },
 ];
 const deviceStepDetails: recommendList[] = [
@@ -70,29 +59,21 @@ const deviceStepDetails: recommendList[] = [
         title: '添加视频设备',
         details: '根据视频设备的传输协议，在已创建的产品下添加对应的设备。',
         iconUrl: '/images/home/bottom-6.png',
-        linkUrl: '/media/device/Save',
+        linkUrl: 'media/Device/Save',
-        auth: hasPermission('/media/device/Save'),
+        auth: hasPermission('media/Device:add'),
-        params: {
-            save: true,
-        },
     },
     {
         title: '查看通道',
         details: '查看设备下的通道数据，可以进行直播、录制等操作。',
         iconUrl: '/images/home/bottom-7.png',
-        linkUrl: '/media/device/Channel',
+        linkUrl: 'media/Device/Channel',
-        auth: hasPermission('/media/device/Save'),
+        auth: hasPermission('media/Device:view'),
-        dialogTag: 'accessMethod',
     },
     {
         title: '分屏展示',
         details: '对多个通道的视频流数据进行分屏展示。',
         iconUrl: '/images/home/bottom-8.png',
-        linkUrl: '/media/SplitScreen',
+        linkUrl: 'media/SplitScreen',
-        auth: hasPermission('/media/SplitScreen'),
-        params: {
-            save: true,
-        },
     },
 ];
 </script>