Merge branch 'ww' into 'main'

fix: system dict control add permission

See merge request huang/yun-teng-iot-front!344

@@ -96,7 +96,7 @@
     deviceProfile: { default: boolean; enabled: boolean; name: string; transportType: string };
     deviceInfo: { longitude: string; latitude: string; address: string };
   }
-  type MarkerList = DeviceInfo & { marker: any };
+  type MarkerList = DeviceInfo & { marker: any; label: any };
 
   export default defineComponent({
     name: 'BaiduMap',
@@ -154,6 +154,7 @@
           const markerList: MarkerList[] = [];
           data.forEach((item) => {
             const {
+              name,
               deviceState,
               deviceInfo: { longitude, latitude },
             } = item;
@@ -161,11 +162,22 @@
             const rivet = deviceState === 'INACTIVE' ? djx : deviceState === 'ONLINE' ? zx : lx;
             const myIcon = new BMap.Icon(rivet, new BMap.Size(20, 30));
             const marker = new BMap.Marker(point, { icon: myIcon });
-            markerList.push({ ...item, marker });
+            const label = new BMap.Label(name, {
+              position: point,
+              offset: new BMap.Size(-15, -45),
+            });
+            label.setStyle({
+              color: '#000',
+              borderRadius: '5px',
+              borderColor: '#ccc',
+              padding: '5px',
+            });
+            markerList.push({ ...item, marker, label });
           });
 
           markerList.forEach((record) => {
             unref(BMapInstance).addOverlay(record.marker);
+            unref(BMapInstance).addOverlay(record.label);
             const isAlarmStatus = !!record.alarmStatus;
             if (isAlarmStatus) {
               const alarmStatusClassName = 'device-status__alarm';

@@ -4,7 +4,9 @@
       <div style="background-color: #f0f2f5">
         <BasicTable @register="registerTable">
           <template #toolbar>
-            <a-button type="primary" @click="handleCreate"> 新增字典值 </a-button>
+            <Authority value="api:yt:dictItem:post">
+              <a-button type="primary" @click="handleCreate"> 新增字典值 </a-button>
+            </Authority>
           </template>
           <template #action="{ record }">
             <TableAction
@@ -12,12 +14,14 @@
                 {
                   label: '编辑',
                   icon: 'clarity:note-edit-line',
+                  auth: 'api:yt:dictItem:update',
                   onClick: handleEdit.bind(null, record),
                 },
                 {
                   label: '删除',
                   icon: 'ant-design:delete-outlined',
                   color: 'error',
+                  auth: 'api:yt:dictItem:delete',
                   popConfirm: {
                     title: '是否确认删除',
                     confirm: handleDelete.bind(null, record),
@@ -44,10 +48,11 @@
 
   import { columns, searchFormSchema } from './dict.item.data';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import Authority from '/@/components/Authority/src/Authority.vue';
 
   export default defineComponent({
     name: 'ItemIndex',
-    components: { BasicDrawer, BasicTable, ItemDrawer, TableAction },
+    components: { BasicDrawer, BasicTable, ItemDrawer, TableAction, Authority },
     setup() {
       let dictId;
       const { createMessage } = useMessage();