From add3a9a5f3f5b6b62dff00ac4c4ef68ab54c5da4 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Mon, 13 Mar 2023 16:39:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=9B=BF=E6=8D=A2=E8=87=AA=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Category/components/modifyModal/index.vue | 34 +++++-----
 src/views/device/Category/index.vue           | 67 +++++++++----------
 src/views/device/DashBoard/index.vue          |  2 +-
 .../DashBoard/components/NewAlarm.vue         | 12 ++--
 src/views/rule-engine/DashBoard/index.vue     | 30 ++++-----
 5 files changed, 69 insertions(+), 76 deletions(-)

diff --git a/src/views/device/Category/components/modifyModal/index.vue b/src/views/device/Category/components/modifyModal/index.vue
index 371b7900..0d94cb56 100644
--- a/src/views/device/Category/components/modifyModal/index.vue
+++ b/src/views/device/Category/components/modifyModal/index.vue
@@ -1,6 +1,6 @@
 <!-- 新增编辑弹窗 -->
 <template>
-    <a-modal
+    <j-modal
         :title="props.title"
         :maskClosable="false"
         destroy-on-close
@@ -11,38 +11,38 @@
         cancelText="取消"
         v-bind="layout"
     >
-        <a-form
+        <j-form
             layout="vertical"
             ref="formRef"
             :rules="rules"
             :model="formModel"
         >
-            <a-form-item label="名称" name="name">
-                <a-input
+            <j-form-item label="名称" name="name">
+                <j-input
                     v-model:value="formModel.name"
                     :maxlength="64"
                     placeholder="请输入名称"
                 />
-            </a-form-item>
-            <a-form-item label="排序" name="sortIndex">
-                <a-input-number
+            </j-form-item>
+            <j-form-item label="排序" name="sortIndex">
+                <j-input-number
                     style="width: 100%"
                     id="inputNumber"
                     v-model:value="formModel.sortIndex"
                     :min="1"
                     placeholder="请输入排序"
                 />
-            </a-form-item>
-            <a-form-item label="说明">
-                <a-textarea
+            </j-form-item>
+            <j-form-item label="说明">
+                <j-textarea
                     v-model:value="formModel.description"
                     show-count
                     :maxlength="200"
                     placeholder="请输入说明"
                 />
-            </a-form-item>
-        </a-form>
-    </a-modal>
+            </j-form-item>
+        </j-form>
+    </j-modal>
 </template>
 <script setup lang="ts" name="modifyModal">
 import { PropType } from 'vue';
@@ -111,20 +111,20 @@ const submitData = async () => {
             if (props.isChild === 1) {
                 addParams.value = {
                     ...formModel.value,
-                    sortIndex:
-                        childArr.value[childArr.value.length - 1].sortIndex + 1,
+                    // sortIndex:
+                        // childArr.value[childArr.value.length - 1].sortIndex + 1,
                     parentId: addObj.value.id,
                 };
             } else if (props.isChild === 2) {
                 addParams.value = {
                     parentId: addObj.value.id,
                     ...formModel.value,
-                    sortIndex: 1,
+                    // sortIndex: 1,
                 };
             } else if (props.isChild === 3) {
                 addParams.value = {
                     ...formModel.value,
-                    sortIndex: arr.value[arr.value.length - 1].sortIndex + 1,
+                    // sortIndex: arr.value[arr.value.length - 1].sortIndex + 1,
                 };
             }
             const res = await saveTree(addParams.value);
diff --git a/src/views/device/Category/index.vue b/src/views/device/Category/index.vue
index 89415faf..5feb2ee1 100644
--- a/src/views/device/Category/index.vue
+++ b/src/views/device/Category/index.vue
@@ -1,12 +1,12 @@
 <!--产品分类 -->
 <template>
-    <a-card class="product-category">
-        <Search
+    <page-container>
+        <pro-search
             :columns="query.columns"
             target="category"
             @search="handleSearch"
         />
-        <JTable
+        <JProTable
             ref="tableRef"
             :columns="table.columns"
             :dataSource="dataSource"
@@ -25,46 +25,38 @@
             :loading="tableLoading"
         >
             <template #headerTitle>
-                <a-button type="primary" @click="add"
-                    ><plus-outlined />新增</a-button
+                <PermissionButton
+                    type="primary"
+                    @click="add"
+                    hasPermission="device/Category:add"
                 >
+                    <template #icon><AIcon type="PlusOutlined" /></template>
+                    新增
+                </PermissionButton>
             </template>
             <template #action="slotProps">
-                <a-space :size="16">
-                    <a-tooltip
+                <j-space :size="16">
+                    <template
                         v-for="i in getActions(slotProps, 'table')"
                         :key="i.key"
-                        v-bind="i.tooltip"
                     >
-                        <a-popconfirm
-                            v-if="i.popConfirm"
-                            v-bind="i.popConfirm"
+                        <PermissionButton
                             :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"
+                            :popConfirm="i.popConfirm"
+                            :hasPermission="'device/Category:' + i.key"
+                            :tooltip="{
+                                ...i.tooltip,
+                            }"
+                            @click="i.onClick"
                             type="link"
-                            v-else
-                            @click="i.onClick && i.onClick(slotProps)"
+                            style="padding: 0px"
                         >
-                            <a-button
-                                :disabled="i.disabled"
-                                style="padding: 0"
-                                type="link"
-                                ><AIcon :type="i.icon"
-                            /></a-button>
-                        </a-button>
-                    </a-tooltip>
-                </a-space>
+                            <template #icon><AIcon :type="i.icon" /></template>
+                        </PermissionButton>
+                    </template>
+                </j-space>
             </template>
-        </JTable>
+        </JProTable>
         <!-- 新增和编辑弹窗 -->
         <ModifyModal
             ref="modifyRef"
@@ -74,7 +66,7 @@
             :isChild="isChild"
             @refresh="refresh"
         />
-    </a-card>
+    </page-container>
 </template>
 <script lang="ts" name="Category" setup>
 import { queryTree, deleteTree } from '@/api/device/category';
@@ -146,6 +138,7 @@ const getTableData = async () => {
     if (res.status === 200) {
         dataSource.value = res.result;
     }
+    tableLoading.value = false;
 };
 getTableData();
 /**
@@ -168,7 +161,7 @@ const getActions = (
     if (!data) return [];
     const actions = [
         {
-            key: 'edit',
+            key: 'update',
             text: '编辑',
             tooltip: {
                 title: '编辑',
@@ -238,8 +231,8 @@ const table = reactive({
         },
         {
             title: '说明',
-            dataIndex: 'describe',
-            key: 'describe',
+            dataIndex: 'description',
+            key: 'description',
         },
         {
             title: '操作',
diff --git a/src/views/device/DashBoard/index.vue b/src/views/device/DashBoard/index.vue
index 7be4f621..db1777ad 100644
--- a/src/views/device/DashBoard/index.vue
+++ b/src/views/device/DashBoard/index.vue
@@ -336,7 +336,7 @@ const setDevMesChartOption = (
         grid: {
             top: '2%',
             bottom: '5%',
-            left: maxY > 100000 ? '90px' : '50px',
+            left: maxY > 100000 ? '90px' : '60px',
             right: '50px',
         },
         series: [
diff --git a/src/views/rule-engine/DashBoard/components/NewAlarm.vue b/src/views/rule-engine/DashBoard/components/NewAlarm.vue
index cf67e0a7..1b3a8dbb 100644
--- a/src/views/rule-engine/DashBoard/components/NewAlarm.vue
+++ b/src/views/rule-engine/DashBoard/components/NewAlarm.vue
@@ -16,22 +16,22 @@
                             }}
                         </div>
                         <div class="new-alarm-item-content">
-                            <a-tooltip
+                            <j-tooltip
                                 :title="item.alarmName"
                                 placement="topLeft"
                             >
                                 <a @click="()=>{return jumpDetail(item)}">{{ item.alarmName }}</a>
-                            </a-tooltip>
+                            </j-tooltip>
                         </div>
                         <div class="new-alarm-item-state">
-                            <a-badge
+                            <j-badge
                                 :status="
                                     item.state?.value === 'warning'
                                         ? 'error'
                                         : 'default'
                                 "
                             >
-                            </a-badge>
+                            </j-badge>
                             <span
                                 :class="
                                     item.state?.value === 'warning'
@@ -55,7 +55,7 @@
             </ul>
         </div>
         <div v-else class="empty-body">
-            <a-empty :image="Empty.PRESENTED_IMAGE_SIMPLE"></a-empty>
+            <j-empty :image="Empty.PRESENTED_IMAGE_SIMPLE"></j-empty>
         </div>
     </div>
 </template>
@@ -73,7 +73,7 @@ const props = defineProps({
 });
 const menuStore = useMenuStore();
 const jumpDetail = (item:any) =>{
-    menuStore.jumpPage(`rule-engine/Alarm/Log/Detail`,{id:item.id},{detail:true});
+    menuStore.jumpPage(`rule-engine/Alarm/Log/Detail`,{id:item.id,detail:true});
 }
 </script>
 <style scoped lang="less">
diff --git a/src/views/rule-engine/DashBoard/index.vue b/src/views/rule-engine/DashBoard/index.vue
index b07a1130..46493a5f 100644
--- a/src/views/rule-engine/DashBoard/index.vue
+++ b/src/views/rule-engine/DashBoard/index.vue
@@ -1,8 +1,8 @@
 <template>
     <page-container>
         <div class="DashBoardBox">
-            <a-row :gutter="24">
-                <a-col :span="6">
+            <j-row :gutter="24">
+                <j-col :span="6">
                     <TopCard
                         title="今日告警"
                         :value="state.today"
@@ -10,33 +10,33 @@
                     >
                         <Charts :options="state.fifteenOptions"></Charts>
                     </TopCard>
-                </a-col>
-                <a-col :span="6">
+                </j-col>
+                <j-col :span="6">
                     <TopCard
                         title="告警配置"
                         :value="state.config"
                         :footer="alarmState"
                         :img="getImage('/device/device-number.png')"
                     ></TopCard>
-                </a-col>
-                <a-col :span="12">
+                </j-col>
+                <j-col :span="12">
                     <NewAlarm :alarm-list="state.alarmList"></NewAlarm>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
+                </j-col>
+            </j-row>
+            <j-row :gutter="24">
+                <j-col :span="24">
                     <div class="alarm-card">
                         <Guide>
                             <template #title>
                                 <span style="margin-right: 24px">告警统计</span>
-                                <a-select
+                                <j-select
                                     style="width: 40%"
                                     v-model:value="queryCodition.targetType"
                                     :options="
                                         isNoCommunity ? selectOpt1 : selectOpt2
                                     "
                                     @change="selectChange"
-                                ></a-select>
+                                ></j-select>
                             </template>
                             <template #extra>
                                 <TimeSelect
@@ -63,13 +63,13 @@
                                     </li>
                                 </ul>
                                 <div v-else class="empty-body">
-                                    <a-empty  :image="Empty.PRESENTED_IMAGE_SIMPLE"></a-empty>
+                                    <j-empty  :image="Empty.PRESENTED_IMAGE_SIMPLE"></j-empty>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </a-col>
-            </a-row>
+                </j-col>
+            </j-row>
         </div>
     </page-container>
 </template>