From 356bf1fccf9d8c036e808c33fbd052297c48d5e5 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Tue, 7 Mar 2023 10:13:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8C=89=E9=92=AE=E9=89=B4=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Product/Detail/DeviceAccess/index.vue     | 22 ++----
 src/views/device/Product/index.vue            | 24 ++++---
 .../rule-engine/Alarm/Config/Io/index.vue     | 72 +++++++++++--------
 src/views/rule-engine/Alarm/Config/index.vue  |  5 +-
 .../Alarm/Configuration/Save/Base/index.vue   |  5 +-
 .../Alarm/Configuration/Save/Scene/index.vue  |  5 +-
 .../rule-engine/Alarm/Configuration/index.vue | 34 ++++++---
 .../rule-engine/Alarm/Log/Detail/index.vue    |  4 +-
 .../rule-engine/Alarm/Log/SolveLog/index.vue  |  4 +-
 .../Alarm/Log/TabComponent/indev.vue          | 33 +++++++--
 .../DashBoard/components/NewAlarm.vue         |  7 +-
 src/views/rule-engine/Instance/index.vue      | 31 ++++++--
 12 files changed, 158 insertions(+), 88 deletions(-)

diff --git a/src/views/device/Product/Detail/DeviceAccess/index.vue b/src/views/device/Product/Detail/DeviceAccess/index.vue
index 7caaaf88..471f81f4 100644
--- a/src/views/device/Product/Detail/DeviceAccess/index.vue
+++ b/src/views/device/Product/Detail/DeviceAccess/index.vue
@@ -4,11 +4,12 @@
         <div v-if="productStore.current.accessId === undefined || null">
             <a-empty :image="simpleImage">
                 <template #description>
-                    <span>
+                    <span v-if="permissionStore.hasPermission('device/Product:update')">
                         请先<a-button type="link" @click="showModal"
                             >选择</a-button
                         >设备接入网关，用以提供设备接入能力
                     </span>
+                    <span v-else>暂无权限，请联系管理员</span>
                 </template>
             </a-empty>
         </div>
@@ -173,9 +174,7 @@
                             </a-select>
                         </a-form-item>
                     </a-form>
-                    <a-button type="primary" @click="submitDevice"
-                        >保存</a-button
-                    >
+                    <PermissionButton type="primary" @click="submitDevice" hasPermission="device/Instance:update">保存</PermissionButton>
                 </a-col>
                 <a-col
                     :span="12"
@@ -271,16 +270,11 @@
             target="deviceModal"
             @search="search"
         />
-        <JTable
+        <JProTable
             :columns="columns"
             :request="queryList"
             ref="tableRef"
             modal="card"
-            :rowSelection="{
-                selectedRowKeys: _selectedRowKeys,
-                onChange: onSelectChange,
-                type: 'radio',
-            }"
             :defaultParams="{
                 ...temp,
                 sorts: [
@@ -343,7 +337,7 @@
             <template #id="slotProps">
                 <a>{{ slotProps.id }}</a>
             </template>
-        </JTable>
+        </JProTable>
     </a-modal>
 </template>
 
@@ -353,6 +347,7 @@ import { ConfigMetadata } from '@/views/device/Product/typings';
 import { Empty, message } from 'ant-design-vue';
 import { getImage } from '@/utils/comm';
 import Title from '../Title/index.vue';
+import { usePermissionStore } from '@/store/permission';
 import './index.less';
 import {
     getProviders,
@@ -375,6 +370,7 @@ import Driver from 'driver.js';
 import 'driver.js/dist/driver.min.css';
 import { marked } from 'marked';
 import type { FormInstance, TableColumnType } from 'ant-design-vue';
+const permissionStore = usePermissionStore();
 const render = new marked.Renderer();
 marked.setOptions({
     renderer: render,
@@ -548,10 +544,6 @@ const temp = {
 const _selectedRowKeys = ref<string[]>([]);
 const currentForm = ref({});
 
-const onSelectChange = (keys: string[]) => {
-    _selectedRowKeys.value = [...keys];
-};
-
 const cancelSelect = () => {
     _selectedRowKeys.value = [];
 };
diff --git a/src/views/device/Product/index.vue b/src/views/device/Product/index.vue
index 97d88c91..6f3ccf08 100644
--- a/src/views/device/Product/index.vue
+++ b/src/views/device/Product/index.vue
@@ -15,19 +15,26 @@
             :params="params"
         >
             <template #headerTitle>
-                <a-space>
-                    <a-button type="primary" @click="add"
-                        ><plus-outlined />新增</a-button
+                <j-space>
+                    <PermissionButton
+                        type="primary"
+                        @click="add"
+                        hasPermission="device/Product:add"
                     >
+                        <template #icon><AIcon type="PlusOutlined" /></template>
+                        新增
+                    </PermissionButton>
                     <a-upload
                         name="file"
                         accept=".json"
                         :showUploadList="false"
                         :before-upload="beforeUpload"
                     >
-                        <a-button>导入</a-button>
+                        <PermissionButton hasPermission="device/Product:import"
+                            >导入</PermissionButton
+                        >
                     </a-upload>
-                </a-space>
+                </j-space>
             </template>
             <template #deviceType="slotProps">
                 <div>{{ slotProps.deviceType.text }}</div>
@@ -130,6 +137,7 @@
                                 ...item.tooltip,
                             }"
                             @click="item.onClick"
+                            :hasPermission="'device/Product:' + item.key"
                         >
                             <AIcon
                                 type="DeleteOutlined"
@@ -193,6 +201,7 @@
                         <PermissionButton
                             :disabled="i.disabled"
                             :popConfirm="i.popConfirm"
+                            :hasPermission="'device/Product:' + i.key"
                             :tooltip="{
                                 ...i.tooltip,
                             }"
@@ -334,12 +343,11 @@ const getActions = (
             },
         },
         {
-            key: 'edit',
+            key: 'update',
             text: '编辑',
             tooltip: {
                 title: '编辑',
             },
-
             icon: 'EditOutlined',
             onClick: () => {
                 title.value = '编辑';
@@ -350,7 +358,7 @@ const getActions = (
             },
         },
         {
-            key: 'download',
+            key: 'export',
             text: '导出',
             tooltip: {
                 title: '导出',
diff --git a/src/views/rule-engine/Alarm/Config/Io/index.vue b/src/views/rule-engine/Alarm/Config/Io/index.vue
index d1799f52..efbab3b2 100644
--- a/src/views/rule-engine/Alarm/Config/Io/index.vue
+++ b/src/views/rule-engine/Alarm/Config/Io/index.vue
@@ -21,15 +21,16 @@
                                         "
                                     />
                                 </a-tooltip>
-                                <div
-                                    style="
-                                        margin: 0 0px 0 4px;
-                                        color: #1d39c4;
-                                        cursor: pointer;
-                                    "
+
+                                <PermissionButton
+                                    type="link"
+                                    @click="showOutput"
+                                    hasPermission="device/Instance:update"
                                 >
-                                    <edit-outlined  @click="showOutput"/>
-                                </div>
+                                    <template #icon
+                                        ><AIcon type="EditOutlined"
+                                    /></template>
+                                </PermissionButton>
                             </div>
                         </template>
                         <a-descriptions
@@ -82,15 +83,14 @@
                                         "
                                     />
                                 </a-tooltip>
-                                <div
-                                    style="
-                                        margin: 0 0px 0 4px;
-                                        color: #1d39c4;
-                                        cursor: pointer;
-                                    "
+                                <PermissionButton
+                                    type="link"
+                                    @click="showInput"
+                                    hasPermission="device/Instance:update"
                                 >
-                                    <edit-outlined  @click="showInput"/>
-                                </div>
+                                    <template #icon
+                                        ><AIcon type="EditOutlined" /></template
+                                ></PermissionButton>
                             </div>
                         </template>
                         <a-descriptions
@@ -168,14 +168,24 @@
                 </div>
             </a-col>
         </a-row>
-        <InputSave :data="input" v-if="inputVisible" @closeModel="closeInput" @saveSuc="saveInput"/>
-        <OutputSave :data="output" v-if="outputVisible" @closeModel="closeOutput" @saveSuc="saveOutput"/>
+        <InputSave
+            :data="input"
+            v-if="inputVisible"
+            @closeModel="closeInput"
+            @saveSuc="saveInput"
+        />
+        <OutputSave
+            :data="output"
+            v-if="outputVisible"
+            @closeModel="closeOutput"
+            @saveSuc="saveOutput"
+        />
     </div>
 </template>
 
 <script lang="ts" setup>
-import InputSave from './Save/input.vue'
-import OutputSave from './save/output.vue'
+import InputSave from './Save/input.vue';
+import OutputSave from './save/output.vue';
 import {
     EditOutlined,
     DeleteOutlined,
@@ -439,24 +449,24 @@ handleInputSearch();
 handleOutputSearch();
 const showInput = () => {
     inputVisible.value = true;
-}
-const closeInput = () =>{
+};
+const closeInput = () => {
     inputVisible.value = false;
-}
-const saveInput = () =>{
+};
+const saveInput = () => {
     inputVisible.value = false;
     handleInputSearch();
-}
-const showOutput = () =>{
+};
+const showOutput = () => {
     outputVisible.value = true;
-}
-const closeOutput = () =>{
+};
+const closeOutput = () => {
     outputVisible.value = false;
-}
-const saveOutput = () =>{
+};
+const saveOutput = () => {
     outputVisible.value = false;
     handleOutputSearch();
-}
+};
 </script>
 <style lang="less" scoped>
 .alarmTitle {
diff --git a/src/views/rule-engine/Alarm/Config/index.vue b/src/views/rule-engine/Alarm/Config/index.vue
index c5e38ce7..93bbf5bc 100644
--- a/src/views/rule-engine/Alarm/Config/index.vue
+++ b/src/views/rule-engine/Alarm/Config/index.vue
@@ -35,12 +35,13 @@
                                 </div>
                             </div>
                         </a-card>
-                        <a-button
+                        <!-- <a-button
                             type="primary"
                             size="middle"
                             @click="handleSaveLevel"
                             >保存</a-button
-                        >
+                        > -->
+                        <PermissionButton type="primary" size="middle" @click="handleSaveLevel" hasPermission="rule-engine/Alarm/Config:update">保存</PermissionButton>
                     </div>
                 </a-col>
                 <a-col :span="10">
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
index 7f488d20..dc755f54 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
@@ -46,9 +46,7 @@
             <a-form-item label="说明" name="description">
                 <a-textarea v-model:value="form.description"></a-textarea>
             </a-form-item>
-            <a-button type="primary" @click="handleSave" :loading="loading"
-                >保存</a-button
-            >
+            <PermissionButton type="primary" @click="handleSave" :hasPermission="['rule-engine/Alarm/Configuration:add','rule-engine/Alarm/Configuration:update']">保存</PermissionButton>
         </a-form>
     </div>
 </template>
@@ -63,6 +61,7 @@ import { useMenuStore } from '@/store/menu';
 import { useRoute } from 'vue-router';
 import { useAlarmConfigurationStore } from '@/store/alarm';
 import { storeToRefs } from 'pinia';
+import { usePermissionStore } from '@/store/permission';
 const route = useRoute();
 const id = route.query?.id;
 let selectDisable = ref(false);
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue
index 27d3933b..58b3b6d2 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue
@@ -11,7 +11,7 @@
     >
         <template #headerTitle>
             <a-space>
-                <PermissionButton type="primary" @click="showModal">
+                <PermissionButton type="primary" @click="showModal" hasPermission="rule-engine/Alarm/Configuration:add">
                     <template #icon><AIcon type="PlusOutlined" /></template>
                     新增
                 </PermissionButton>
@@ -64,6 +64,7 @@
                             ...item.tooltip,
                         }"
                         @click="item.onClick"
+                        :hasPermission="'rule-engine/Alarm/Configuration:'+item.key"
                     >
                         <AIcon :type="item.icon" />
                         <span>{{ item?.text }}</span>
@@ -137,7 +138,7 @@ const getActions = (
     if (!data) return [];
     const actions: ActionsType[] = [
         {
-            key: 'unbind',
+            key: 'action',
             text: '解绑',
             icon: 'DisconnectOutlined',
             popConfirm: {
diff --git a/src/views/rule-engine/Alarm/Configuration/index.vue b/src/views/rule-engine/Alarm/Configuration/index.vue
index 61135340..7286bbfe 100644
--- a/src/views/rule-engine/Alarm/Configuration/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/index.vue
@@ -10,7 +10,7 @@
                 :columns="columns"
                 :request="queryList"
                 :gridColumn="3"
-                :gridColumns="[1,2,3]"
+                :gridColumns="[1, 2, 3]"
                 ref="tableRef"
                 :defaultParams="{
                     sorts: [{ name: 'createTime', order: 'desc' }],
@@ -18,11 +18,18 @@
                 :params="params"
             >
                 <template #headerTitle>
-                    <a-space>
-                        <a-button type="primary" @click="add"
-                            ><plus-outlined />新增</a-button
+                    <j-space>
+                        <PermissionButton
+                            type="primary"
+                            @click="add"
+                            hasPermission="device/Instance:add"
                         >
-                    </a-space>
+                            <template #icon
+                                ><AIcon type="PlusOutlined"
+                            /></template>
+                            新增
+                        </PermissionButton>
+                    </j-space>
                 </template>
                 <template #card="slotProps">
                     <CardBox
@@ -74,13 +81,17 @@
                         <template #actions="item">
                             <PermissionButton
                                 v-if="
-                                    item.key != 'trigger' ||
+                                    item.key != 'tigger' ||
                                     slotProps.sceneTriggerType == 'manual'
                                 "
                                 :disabled="item.disabled"
                                 :popConfirm="item.popConfirm"
                                 :tooltip="{ ...item.tootip }"
                                 @click="item.onClick"
+                                :hasPermission="
+                                    'rule-engine/Alarm/Configuration:' +
+                                    item.key
+                                "
                             >
                                 <AIcon
                                     type="DeleteOutlined"
@@ -136,7 +147,7 @@
                         >
                             <PermissionButton
                                 v-if="
-                                    i.key != 'trigger' ||
+                                    i.key != 'tigger' ||
                                     slotProps.sceneTriggerType == 'manual'
                                 "
                                 :disabled="i.disabled"
@@ -147,6 +158,10 @@
                                 @click="i.onClick"
                                 type="link"
                                 style="padding: 0px"
+                                :hasPermission="
+                                    'rule-engine/Alarm/Configuration:' +
+                                    item.key
+                                "
                             >
                                 <template #icon
                                     ><AIcon :type="i.icon"
@@ -161,7 +176,6 @@
 </template>
 
 <script lang="ts" setup>
-import JTable from '@/components/Table';
 import {
     queryList,
     _enable,
@@ -323,7 +337,7 @@ const getActions = (
     }
     const actions = [
         {
-            key: 'trigger',
+            key: 'tigger',
             text: '手动触发',
             disabled: data?.state?.value === 'disabled',
             tooltip: {
@@ -353,7 +367,7 @@ const getActions = (
             icon: 'LikeOutlined',
         },
         {
-            key: 'edit',
+            key: 'update',
             text: '编辑',
             tooltip: {
                 title: '编辑',
diff --git a/src/views/rule-engine/Alarm/Log/Detail/index.vue b/src/views/rule-engine/Alarm/Log/Detail/index.vue
index cba14fdb..ccfdb169 100644
--- a/src/views/rule-engine/Alarm/Log/Detail/index.vue
+++ b/src/views/rule-engine/Alarm/Log/Detail/index.vue
@@ -5,7 +5,7 @@
             target="alarm-log-detail"
             @search="handleSearch"
         ></Search>
-        <JTable
+        <JProTable
             :columns="columns"
             model="TABLE"
             :request="queryList"
@@ -39,7 +39,7 @@
                     </template>
                 </a-space>
             </template>
-        </JTable>
+        </JProTable>
         <Info v-if="visiable"  :data="current" @close="close"/>
     </page-container>
 </template>
diff --git a/src/views/rule-engine/Alarm/Log/SolveLog/index.vue b/src/views/rule-engine/Alarm/Log/SolveLog/index.vue
index 303343f6..f038dbb6 100644
--- a/src/views/rule-engine/Alarm/Log/SolveLog/index.vue
+++ b/src/views/rule-engine/Alarm/Log/SolveLog/index.vue
@@ -13,7 +13,7 @@
             target="bind-channel"
             @search="handleSearch"
         ></Search>
-        <JTable
+        <JProTable
             model="TABLE"
             :columns="columns"
             :defaultParams="{
@@ -47,7 +47,7 @@
                     }}
                 </span>
             </template>
-        </JTable>
+        </JProTable>
     </a-modal>
 </template>
 
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
index a5f35d04..52c2b3f5 100644
--- a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
@@ -28,7 +28,7 @@
             :columns="columns"
             :request="handleSearch"
             :params="params"
-            :gridColumns="[1,1,2]"
+            :gridColumns="[1, 1, 2]"
             :gridColumn="2"
             model="CARD"
         >
@@ -98,16 +98,23 @@
                                 </span>
                             </a-col>
                         </a-row>
-                        
                     </template>
                     <template #actions="item">
                         <PermissionButton
-                            :disabled="item.key === 'solve' && slotProps.state.value ==='normal'"
+                            :disabled="
+                                item.key === 'solve' &&
+                                slotProps.state.value === 'normal'
+                            "
                             :popConfirm="item.popConfirm"
                             :tooltip="{
                                 ...item.tooltip,
                             }"
                             @click="item.onClick"
+                            :hasPermission="
+                                item.key == 'solve'
+                                    ? 'rule-engine/Alarm/Log:action'
+                                    : 'rule-engine/Alarm/Log:view'
+                            "
                         >
                             <AIcon :type="item.icon" />
                             <span>{{ item?.text }}</span>
@@ -116,8 +123,16 @@
                 </CardBox>
             </template>
         </JProTable>
-        <SolveComponent :data="data" v-if="data.solveVisible" @closeSolve="closeSolve"/>
-        <SolveLog :data="data.current" v-if="data.logVisible" @closeLog="closeLog"/>
+        <SolveComponent
+            :data="data"
+            v-if="data.solveVisible"
+            @closeSolve="closeSolve"
+        />
+        <SolveLog
+            :data="data.current"
+            v-if="data.logVisible"
+            @closeLog="closeLog"
+        />
     </div>
 </template>
 
@@ -139,6 +154,7 @@ import type { ActionsType } from '@/components/Table';
 import SolveComponent from '../SolveComponent/index.vue';
 import SolveLog from '../SolveLog/index.vue'
 import { useMenuStore } from '@/store/menu';
+import { usePermissionStore } from '@/store/permission';
 const menuStory = useMenuStore();
 
 const alarmStore = useAlarmStore();
@@ -368,6 +384,13 @@ const getActions = (
             onClick: () =>{
                 data.value.current = currentData;
                 data.value.solveVisible = true;
+            },
+            popConfirm:{
+                title:  !usePermissionStore().hasPermission('rule-engine/Alarm/Log:action')
+          ? '暂无权限，请联系管理员'
+          : data.state?.value === 'normal'
+          ? '无告警'
+          : ''
             }
         },
         {
diff --git a/src/views/rule-engine/DashBoard/components/NewAlarm.vue b/src/views/rule-engine/DashBoard/components/NewAlarm.vue
index 6c7125d8..a5946cab 100644
--- a/src/views/rule-engine/DashBoard/components/NewAlarm.vue
+++ b/src/views/rule-engine/DashBoard/components/NewAlarm.vue
@@ -20,7 +20,7 @@
                                 :title="item.alarmName"
                                 placement="topLeft"
                             >
-                                <a>{{ item.alarmName }}</a>
+                                <a @click="()=>{return jumpDetail(item)}">{{ item.alarmName }}</a>
                             </a-tooltip>
                         </div>
                         <div class="new-alarm-item-state">
@@ -63,6 +63,7 @@
 <script lang="ts" setup>
 import { Empty } from 'ant-design-vue';
 import { getImage } from '@/utils/comm';
+import { useMenuStore } from '@/store/menu';
 import moment from 'moment';
 const props = defineProps({
     alarmList: {
@@ -70,6 +71,10 @@ const props = defineProps({
         default: [],
     },
 });
+const menuStore = useMenuStore();
+const jumpDetail = (item:any) =>{
+    menuStore.jumpPage(`rule-engine/Alarm/Log/Detail`,{id:item.id});
+}
 </script>
 <style scoped lang="less">
 .new-alarm {
diff --git a/src/views/rule-engine/Instance/index.vue b/src/views/rule-engine/Instance/index.vue
index 88878ccf..3078cec7 100644
--- a/src/views/rule-engine/Instance/index.vue
+++ b/src/views/rule-engine/Instance/index.vue
@@ -6,7 +6,7 @@
                 target="device-instance"
                 @search="handleSearch"
             ></Search>
-            <JTable
+            <JProTable
                 :columns="columns"
                 :request="queryList"
                 ref="tableRef"
@@ -16,11 +16,18 @@
                 :params="params"
             >
                 <template #headerTitle>
-                    <a-space>
-                        <a-button type="primary" @click="add"
-                            ><plus-outlined />新增</a-button
+                    <j-space>
+                        <PermissionButton
+                            type="primary"
+                            @click="add"
+                            hasPermission="rule-engine/Instance:add"
                         >
-                    </a-space>
+                            <template #icon
+                                ><AIcon type="PlusOutlined"
+                            /></template>
+                            新增
+                        </PermissionButton>
+                    </j-space>
                 </template>
                 <template #card="slotProps">
                     <CardBox
@@ -29,6 +36,7 @@
                         v-bind="slotProps"
                         :status="slotProps.state?.value"
                         :statusText="slotProps.state?.text"
+                        @click="openRuleEditor"
                         :statusNames="{
                             started: 'success',
                             disable: 'error',
@@ -62,6 +70,9 @@
                                 :tooltip="{
                                     ...item.tooltip,
                                 }"
+                                :hasPermission="
+                                    'rule-engine/Instance:' + item.key
+                                "
                                 @click="item.onClick"
                             >
                                 <AIcon
@@ -113,7 +124,7 @@
                         </template>
                     </a-space>
                 </template>
-            </JTable>
+            </JProTable>
             <!-- 新增、编辑 -->
             <Save
                 ref="saveRef"
@@ -138,6 +149,7 @@ import type { ActionsType } from '@/components/Table/index.vue';
 import { getImage } from '@/utils/comm';
 import { message } from 'ant-design-vue';
 import Save from './Save/index.vue';
+import { SystemConst } from '@/utils/consts';
 const params = ref<Record<string, any>>({});
 let isAdd = ref<number>(0);
 let title = ref<string>('');
@@ -216,7 +228,7 @@ const getActions = (
     }
     const actions = [
         {
-            key: 'edit',
+            key: 'update',
             text: '编辑',
             tooltip: {
                 title: '编辑',
@@ -312,6 +324,11 @@ const refresh = () => {
 const handleSearch = (e: any) => {
     params.value = e;
 };
+const openRuleEditor = (item: any) => {
+    window.open(
+        `/${SystemConst.API_BASE}/rule-editor/index.html#flow/${item.id}`,
+    );
+};
 </script>
 <style scoped>
 </style>
\ No newline at end of file