From ad14983d9cdd5d3044570896c8d22ac8b941cb16 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Tue, 28 Mar 2023 18:48:30 +0800
Subject: [PATCH 1/5] fix: bug#10985

---
 src/views/iot-card/CardManagement/Save.vue   | 40 ++++++++++++--------
 src/views/iot-card/CardManagement/index.vue  | 10 ++---
 src/views/iot-card/Platform/Detail/index.vue | 23 +----------
 src/views/iot-card/data.ts                   | 23 +++++++----
 4 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/src/views/iot-card/CardManagement/Save.vue b/src/views/iot-card/CardManagement/Save.vue
index bd3ecf76..bb158f3a 100644
--- a/src/views/iot-card/CardManagement/Save.vue
+++ b/src/views/iot-card/CardManagement/Save.vue
@@ -42,6 +42,17 @@
                         :disabled="type === 'edit'"
                     />
                 </j-form-item>
+                <j-form-item label="运营商" name="operatorName">
+                  <j-select
+                    allowClear
+                    showSearch
+                    :filter-option="filterOption"
+                    :options="OperatorList"
+                    v-model:value="modelRef.operatorName"
+                    placeholder="请选择运营商"
+                  >
+                  </j-select>
+                </j-form-item>
                 <j-form-item label="平台对接" name="platformConfigId">
                     <j-select
                         showSearch
@@ -55,17 +66,7 @@
                 </j-select>
                 </j-form-item>
 
-                <j-form-item label="运营商" name="operatorName">
-                    <j-select
-                        allowClear
-                        showSearch
-                        :filter-option="filterOption"
-                        :options="OperatorList"
-                        v-model:value="modelRef.operatorName"
-                        placeholder="请选择运营商"
-                    >
-                    </j-select>
-                </j-form-item>
+
                 <j-form-item label="类型" name="cardType">
                     <j-select
                         allowClear
@@ -113,7 +114,7 @@ const props = defineProps({
 });
 
 const btnLoading = ref<boolean>(false);
-const platformConfigList = ref<Record<string, any>[]>([]);
+const platformConfigCacheList = ref<Record<string, any>[]>([]);
 
 const formRef = ref();
 
@@ -184,6 +185,12 @@ const rules = {
             message: '请选择平台对接',
         },
     ],
+    operatorName: [
+      {
+        required: true,
+        message: '请选择运营商',
+      },
+    ],
     cardType: [
         {
             required: true,
@@ -200,6 +207,10 @@ const filterOption = (input: string, option: any) => {
     );
 };
 
+const platformConfigList = computed(() => {
+  return platformConfigCacheList.value.filter(item => item.operatorName === modelRef.operatorName).map(item => ({ label: item.name, value: item.id }))
+})
+
 watch(
     () => props.data,
     (newValue) => {
@@ -209,10 +220,7 @@ watch(
             terms: [{ column: 'state', value: 'enabled' }],
         }).then((resp: any) => {
             if (resp.status === 200) {
-                platformConfigList.value = resp.result.map((item: any) => ({
-                    label: item.name,
-                    value: item.id,
-                }));
+              platformConfigCacheList.value = resp.result
             }
         });
         Object.assign(modelRef, newValue);
diff --git a/src/views/iot-card/CardManagement/index.vue b/src/views/iot-card/CardManagement/index.vue
index 780e4ee1..55a2024c 100644
--- a/src/views/iot-card/CardManagement/index.vue
+++ b/src/views/iot-card/CardManagement/index.vue
@@ -307,6 +307,9 @@
                     }}
                 </div>
             </template>
+            <template #operatorName='slotProps'>
+              {{ OperatorMap[slotProps.operatorName]}}
+            </template>
             <template #cardType="slotProps">
                 {{ slotProps.cardType.text }}
             </template>
@@ -423,6 +426,7 @@ import BatchDropdown from '@/components/BatchDropdown/index.vue';
 import { BatchActionsType } from '@/components/BatchDropdown/types';
 import {usePermissionStore} from "store/permission";
 import {useRouterParams} from "@/utils/hooks/useParams";
+import { OperatorList, OperatorMap } from '@/views/iot-card/data'
 
 const router = useRouter();
 const menuStory = useMenuStore();
@@ -505,11 +509,7 @@ const columns = [
         width: 120,
         search: {
             type: 'select',
-            options: [
-                { label: '移动', value: '移动' },
-                { label: '电信', value: '电信' },
-                { label: '联通', value: '联通' },
-            ],
+            options: OperatorList,
         },
     },
     {
diff --git a/src/views/iot-card/Platform/Detail/index.vue b/src/views/iot-card/Platform/Detail/index.vue
index 552cac40..1d96cd29 100644
--- a/src/views/iot-card/Platform/Detail/index.vue
+++ b/src/views/iot-card/Platform/Detail/index.vue
@@ -130,11 +130,11 @@
 </template>
 
 <script lang="ts" setup>
-import { getImage } from '@/utils/comm';
 import PlatformType from '@/views/iot-card/components/PlatformType.vue';
 import { queryById, save, update } from '@/api/iot-card/platform';
 import { message } from 'jetlinks-ui-components';
 import Doc from '../doc/index.vue';
+import { platformTypeList } from '../../data'
 
 const router = useRouter();
 const route = useRoute();
@@ -158,27 +158,6 @@ const form = reactive({
     explain: undefined,
 });
 
-const platformTypeList = [
-    {
-        label: '移动OneLink',
-        value: 'onelink',
-        imgUrl: getImage('/iot-card/onelink.png'),
-        imgSize: ['78px', '20px'],
-    },
-    {
-        label: '电信Ctwing',
-        value: 'ctwing',
-        imgUrl: getImage('/iot-card/ctwingcmp.png'),
-        imgSize: ['52px', '25px'],
-    },
-    {
-        label: '联通Unicom',
-        value: 'unicom',
-        imgUrl: getImage('/iot-card/unicom.png'),
-        imgSize: ['56px', '41px'],
-    },
-];
-
 const rules = {
     name: [
         { required: true, message: '请输入名称' },
diff --git a/src/views/iot-card/data.ts b/src/views/iot-card/data.ts
index cf9a9fc3..084c51e3 100644
--- a/src/views/iot-card/data.ts
+++ b/src/views/iot-card/data.ts
@@ -1,37 +1,46 @@
 import { getImage } from '@/utils/comm';
 
 // 平台类型
-export const PlatformTypeList = [
+export const platformTypeList = [
   {
     label: '移动OneLink',
-    value: 'OneLinkPB',
+    value: 'onelink',
     imgUrl: getImage('/iot-card/onelink.png'),
+    imgSize: ['78px', '20px'],
   },
   {
     label: '电信Ctwing',
-    value: 'CtwingCmp',
+    value: 'ctwing',
     imgUrl: getImage('/iot-card/ctwingcmp.png'),
+    imgSize: ['52px', '25px'],
   },
   {
     label: '联通Unicom',
-    value: 'UnicomCmp',
+    value: 'unicom',
     imgUrl: getImage('/iot-card/unicom.png'),
+    imgSize: ['56px', '41px'],
   },
 ];
 
+export const OperatorMap = {
+  onelink: '移动',
+  ctwing: '电信',
+  unicom: '联通',
+}
+
 //运营商
 export const OperatorList = [
   {
     label: '移动',
-    value: '移动',
+    value: 'onelink',
   },
   {
     label: '电信',
-    value: '电信',
+    value: 'ctwing',
   },
   {
     label: '联通',
-    value: '联通',
+    value: 'unicom',
   },
 ];
 

From 43edb14f164866bad017f4a898c8e56ca8383a68 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Tue, 28 Mar 2023 20:09:42 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/components/DeviceCountCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/home/components/DeviceCountCard.vue b/src/views/home/components/DeviceCountCard.vue
index 956b96f4..e9092727 100644
--- a/src/views/home/components/DeviceCountCard.vue
+++ b/src/views/home/components/DeviceCountCard.vue
@@ -12,7 +12,7 @@
             <div class="box-item">
                 <div class="label">设备数量</div>
                 <div class="value">{{ deviceNum }}</div>
-                <img src="/images/home/Group 3793.png" alt="" />
+                <img src="/images/home/Group3793.png" alt="" />
             </div>
         </div>
     </div>

From 381ea887e817381f84442d4778beff7376b2076e Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Tue, 28 Mar 2023 21:03:58 +0800
Subject: [PATCH 3/5] fix: bug#11035

---
 src/views/iot-card/CardManagement/index.vue | 4 ++--
 src/views/iot-card/Platform/index.vue       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/iot-card/CardManagement/index.vue b/src/views/iot-card/CardManagement/index.vue
index 55a2024c..38cb1f75 100644
--- a/src/views/iot-card/CardManagement/index.vue
+++ b/src/views/iot-card/CardManagement/index.vue
@@ -156,11 +156,11 @@
                         </slot>
                     </template>
                     <template #content>
+                      <span style="font-size: 16px; font-weight: 600">
                         <Ellipsis style="width: calc(100% - 100px)">
-                            <span style="font-size: 16px; font-weight: 600">
                                 {{ slotProps.id }}
-                            </span>
                         </Ellipsis>
+                      </span>
                         <j-row style="margin-top: 20px">
                             <j-col :span="8">
                                 <div class="card-item-content-text">
diff --git a/src/views/iot-card/Platform/index.vue b/src/views/iot-card/Platform/index.vue
index f385e5b9..50e2e170 100644
--- a/src/views/iot-card/Platform/index.vue
+++ b/src/views/iot-card/Platform/index.vue
@@ -27,7 +27,9 @@
                     </template>
                     <template #content>
                         <h3 class="card-item-content-title">
+                          <Ellipsis>
                             {{ slotProps.name }}
+                          </Ellipsis>
                         </h3>
                         <j-row>
                             <j-col :span="12">

From a5189bd29e1a80e4681370d06b483c45cc89ab1b Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Wed, 29 Mar 2023 09:11:22 +0800
Subject: [PATCH 4/5] =?UTF-8?q?update:=20=E6=B7=BB=E5=8A=A0node=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=8E=A7=E5=88=B6=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package.json b/package.json
index 8e4954cc..a891a236 100644
--- a/package.json
+++ b/package.json
@@ -76,5 +76,9 @@
     "**/*.{html,css,less,md}": [
       "prettier --write"
     ]
+  },
+  "volta": {
+    "node": "18.14.0",
+    "yarn": "1.22.0"
   }
 }

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 5/5] =?UTF-8?q?fix:=20bug#11071=E3=80=8111075=E3=80=811105?=
 =?UTF-8?q?8=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>