From 6cb8e67da23abdec43dfc48d0a528d72dbed21bd Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Wed, 29 Mar 2023 10:53:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#11071=E3=80=8111075=E3=80=8111058?=
 =?UTF-8?q?=E3=80=8111062=E3=80=8111151?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/media/Device/Channel/index.vue      | 83 +++++++++++--------
 src/views/system/Apply/index.vue              |  2 +-
 src/views/system/Department/device/index.vue  |  4 +-
 src/views/system/Department/product/index.vue |  2 +-
 .../Platforms/Api/components/ChooseApi.vue    |  9 +-
 5 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/src/views/media/Device/Channel/index.vue b/src/views/media/Device/Channel/index.vue
index 1e155bc0..f595c3b5 100644
--- a/src/views/media/Device/Channel/index.vue
+++ b/src/views/media/Device/Channel/index.vue
@@ -47,9 +47,15 @@
                         >
                             <j-button type="primary" disabled> 新增 </j-button>
                         </j-tooltip>
-                        <j-button type="primary" @click="handleAdd" v-else>
-                            新增
-                        </j-button>
+                        <PermissionButton
+                            type="primary"
+                            @click="handleAdd"
+                            hasPermission="media/Device:add"
+                        >
+                            <template #icon
+                                ><AIcon type="PlusOutlined" />新增</template
+                            >
+                        </PermissionButton>
                     </template>
                     <template #status="slotProps">
                         <j-space>
@@ -64,41 +70,52 @@
                         </j-space>
                     </template>
                     <template #action="slotProps">
-                        <j-space :size="16">
-                            <j-tooltip
+                        <j-space>
+                            <template
                                 v-for="i in getActions(slotProps, 'table')"
                                 :key="i.key"
-                                v-bind="i.tooltip"
                             >
-                                <j-popconfirm
-                                    v-if="i.popConfirm"
-                                    v-bind="i.popConfirm"
+                                <PermissionButton
+                                    v-if="
+                                        i.key !== 'play' && i.key !== 'backPlay'
+                                    "
+                                    :danger="i.key === 'delete'"
                                     :disabled="i.disabled"
-                                >
-                                    <j-button
-                                        :disabled="i.disabled"
-                                        style="padding: 0"
-                                        type="link"
-                                        :danger="i.key === 'delete'"
-                                    >
-                                        <AIcon :type="i.icon" />
-                                    </j-button>
-                                </j-popconfirm>
-                                <j-button
-                                    style="padding: 0"
+                                    :popConfirm="i.popConfirm"
+                                    :tooltip="{
+                                        ...i.tooltip,
+                                    }"
+                                    @click="i.onClick"
                                     type="link"
-                                    v-else
-                                    @click="i.onClick && i.onClick(slotProps)"
+                                    style="padding: 0px"
+                                    :hasPermission="'media/Device:' + i.key"
                                 >
-                                    <j-button
-                                        :disabled="i.disabled"
-                                        style="padding: 0"
-                                        type="link"
-                                    >
-                                        <AIcon :type="i.icon" />
-                                    </j-button>
-                                </j-button>
-                            </j-tooltip>
+                                    <template #icon
+                                        ><AIcon :type="i.icon"
+                                    /></template>
+                                </PermissionButton>
+                                <!-- 回放/播放不要权限控制 -->
+                                <template v-else>
+                                    <j-tooltip :key="i.key" v-bind="i.tooltip">
+                                        <j-button
+                                            style="padding: 0px"
+                                            type="link"
+                                            @click="
+                                                i.onClick &&
+                                                    i.onClick(slotProps)
+                                            "
+                                        >
+                                            <j-button
+                                                :disabled="i.disabled"
+                                                style="padding: 0"
+                                                type="link"
+                                            >
+                                                <AIcon :type="i.icon" />
+                                            </j-button>
+                                        </j-button>
+                                    </j-tooltip>
+                                </template>
+                            </template>
                         </j-space>
                     </template>
                 </JProTable>
@@ -216,7 +233,7 @@ const getActions = (
     if (!data) return [];
     const actions = [
         {
-            key: 'edit',
+            key: 'update',
             text: '编辑',
             tooltip: {
                 title: '编辑',
diff --git a/src/views/system/Apply/index.vue b/src/views/system/Apply/index.vue
index 0e5658e9..cc6fbb52 100644
--- a/src/views/system/Apply/index.vue
+++ b/src/views/system/Apply/index.vue
@@ -325,7 +325,7 @@ const table = {
                 onClick: () => table.toSave(data.id),
             },
             {
-                permission: `${permission}:update`,
+                permission: `${permission}:action`,
                 key: 'action',
                 text: disabled ? '禁用' : '启用',
                 tooltip: {
diff --git a/src/views/system/Department/device/index.vue b/src/views/system/Department/device/index.vue
index d4e70dc4..0e7ed4c4 100644
--- a/src/views/system/Department/device/index.vue
+++ b/src/views/system/Department/device/index.vue
@@ -336,14 +336,14 @@ const table = {
         else
             return [
                 {
-                    permission: true,
+                    permission: `${permission}:assert`,
                     key: 'edit',
                     tooltip: { title: '编辑' },
                     icon: 'EditOutlined',
                     onClick: () => table.clickEdit(data),
                 },
                 {
-                    permission: true,
+                    permission: `${permission}:bind`,
                     key: 'unbind',
                     tooltip: { title: '解除绑定' },
                     popConfirm: {
diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index 1873d052..ff81e1e8 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -345,7 +345,7 @@ const table = {
                     onClick: () => table.clickEdit(data),
                 },
                 {
-                    permission: `${permission}:assert`,
+                    permission: `${permission}:bind`,
                     key: 'unbind',
                     tooltip: { title: '解除绑定' },
                     popConfirm: {
diff --git a/src/views/system/Platforms/Api/components/ChooseApi.vue b/src/views/system/Platforms/Api/components/ChooseApi.vue
index db2aa314..c61338a5 100644
--- a/src/views/system/Platforms/Api/components/ChooseApi.vue
+++ b/src/views/system/Platforms/Api/components/ChooseApi.vue
@@ -18,9 +18,14 @@
             </j-pro-table>
         </div>
 
-        <j-button type="primary" @click="save" v-if="props.mode !== 'home'"
-            >保存</j-button
+        <PermissionButton
+            type="primary"
+            hasPermission="system/Platforms/Setting:update"
+            @click="save"
+            v-if="props.mode !== 'home'"
         >
+            保存
+        </PermissionButton>
     </div>
 </template>