tangning 1 年之前
父節點
當前提交
b2aef1b8cc

+ 12 - 2
src/views/device/index.vue

@@ -12,6 +12,11 @@
             stopButtonPropagation
             :actions="[
               {
+                label: '优先级',
+                ifShow: getCheckPerm('device-priority'),
+                onClick: handlePriority.bind(null, record),
+              },
+              {
                 label: '出库',
                 ifShow: getCheckPerm('device-out'),
                 onClick: handleCheckout.bind(null, record),
@@ -93,6 +98,7 @@ import { lte } from 'lodash';
       const { createMessage, createConfirm } = useMessage();
       const permissionStore = usePermissionStore();
       const { getCheckPerm } = permissionStore;
+      const [registerPriority, { openModal: openPriorityModal }] = useModal();
       const [registerLinkModal, { openModal: openLinkModal }] = useModal();
       const [registerEditModal, { openModal: openEditModal }] = useModal();
       const [register, { openModal }] = useModal();
@@ -195,7 +201,7 @@ import { lte } from 'lodash';
           ifShow: true,
           fixed: 'right',
           flag: 'ACTION',
-          width: 180,
+          width: 240,
         },
       ];
       const searchForm: Partial<FormProps> = {
@@ -409,7 +415,9 @@ import { lte } from 'lodash';
           },
         });
       }
-
+      function handlePriority(record) {
+        openPriorityModal(true, {cameraId:record.id});
+      }
       function deviceLink() {
         openLinkModal(true);
       }
@@ -453,6 +461,8 @@ import { lte } from 'lodash';
         handleDelete,
         registerPut,
         getCheckPerm,
+        handlePriority,
+        registerPriority,
       };
     },
   });

+ 12 - 12
src/views/product/rtk/list.vue

@@ -85,6 +85,18 @@
           },
         },
         {
+          title: '板卡sn号',
+          ellipsis: true,
+          dataIndex: 'rtkSnCode',
+          width: 150,
+        },
+        {
+          title: '运营商',
+          ellipsis: true,
+          dataIndex: 'operator',
+          width: 120,
+        },
+        {
           title: 'IP地址',
           ellipsis: true,
           dataIndex: 'ipAddr',
@@ -109,18 +121,6 @@
           width: 120,
         },
         {
-          title: '板卡sn号',
-          ellipsis: true,
-          dataIndex: 'rtkSnCode',
-          width: 150,
-        },
-        {
-          title: '运营商',
-          ellipsis: true,
-          dataIndex: 'operator',
-          width: 120,
-        },
-        {
           title: '创建人',
           ellipsis: true,
           dataIndex: 'createNickName',

+ 1 - 1
src/views/productOperation/cameraScene.vue

@@ -57,7 +57,7 @@
               },
               {
                 label: '优先级',
-                ifShow: getTypeCheckPerm('scenes-move') && record.status == -4,
+                ifShow: getTypeCheckPerm('scenes-priority') && record.status == -4,
                 onClick: handlePriority.bind(null, record),
               },
               {

+ 12 - 0
src/views/productOperation/data.ts

@@ -18,6 +18,18 @@ export const getSchemas = () => {
       },
     },
     {
+      field: 'sceneCodes',
+      label: '作品码',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+      },
+      colProps: {
+        xl: 7,
+        xxl: 7,
+      },
+    },
+    {
       field: 'num',
       label: '场景码',
       component: 'Input',