tangning 1 rok pred
rodič
commit
d90cff417b

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

@@ -307,7 +307,8 @@
       }
       async function handleMove(record: Recordable) {
         openMoveModal(true, {
-          ...record,
+          num: record.num,
+          sceneName: record.sceneName,
         });
       }
       let timer: null = ref(null);

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

@@ -18,6 +18,74 @@ export const getSchemas = () => {
       },
     },
     {
+      field: 'num',
+      label: '场景码',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+      },
+      colProps: {
+        xl: 7,
+        xxl: 7,
+      },
+    },
+    {
+      field: 'snCode',
+      label: 'SN码',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+      },
+      colProps: {
+        xl: 7,
+        xxl: 7,
+      },
+    },
+    {
+      field: 'userName',
+      label: '绑定账号',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+      },
+      colProps: {
+        xl: 7,
+        xxl: 7,
+      },
+    },
+    {
+      field: 'timeList',
+      label: '拍摄时间段',
+      component: 'RangePicker',
+      componentProps: {
+        maxLength: 100,
+        minWidth: '385px',
+        format: 'YYYY-MM-DD',
+        valueFormat: 'YYYY-MM-DD',
+        showTime: true,
+      },
+      colProps: {
+        xl: 8,
+        xxl: 8,
+      },
+    },
+  ];
+};
+export const getquanjingSchemas = () => {
+  return [
+    {
+      field: 'sceneName',
+      label: '场景标题',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+      },
+      colProps: {
+        xl: 7,
+        xxl: 7,
+      },
+    },
+    {
       field: 'sceneCodes',
       label: '作品码',
       component: 'Input',

+ 1 - 1
src/views/productOperation/modal/MoveModal.vue

@@ -86,7 +86,7 @@
           ],
           componentProps: {
             placeholder: '请输入相机SN码',
-            maxLength: 15,
+            maxLength: 20,
             onChange: (data) => {
               console.log('data', data);
             },

+ 2 - 1
src/views/productOperation/modal/priorityMoadl.vue

@@ -112,7 +112,8 @@
           ifShow: false,
         });
         setFieldsValue({
-          ...data,
+          num: data.num,
+          cameraId: data.num ? '' : data.cameraId,
           configId: id,
         });
       }

+ 7 - 7
src/views/productOperation/viewKankan.vue

@@ -68,24 +68,24 @@
             :actions="[
               {
                 label: '迁移',
-                disabled: !(record.status == 1 || record.status == -2),
+                disabled: !record.calcStatus == 1,
                 ifShow: getTypeCheckPerm('scenes-move') && tableType != 3,
                 onClick: handleMove.bind(null, record),
               },
               {
                 label: '优先级',
-                ifShow: getTypeCheckPerm('scenes-move') && record.statusString == -4,
+                ifShow: getTypeCheckPerm('scenes-move') && record.calcStatus == 0,
                 onClick: handlePriority.bind(null, record),
               },
               {
                 label: '解冻',
-                disabled: !record.isColdStorage || !(record.status == 1 || record.status == -2),
+                disabled: !record.isColdStorage || !record.calcStatus == 1,
                 ifShow: getTypeCheckPerm('scenes-thaw'),
                 onClick: handleColdStorage.bind(null, record),
               },
               {
                 label: '重算',
-                disabled: record.status == 0 || (record.status == -2 && record.payStatus != 1),
+                disabled: record.calcStatus == 0 || (record.status == 1 && record.payStatus != 1),
                 ifShow: getTypeCheckPerm('scenes-recalculate') && tableType != 3,
                 popConfirm: {
                   title: '是否重算?',
@@ -97,7 +97,7 @@
                 //icon: 'ic:outline-delete-outline',
                 color: 'error',
                 ifShow: getTypeCheckPerm('scenes-delete'),
-                disabled: record.status == 0,
+                disabled: record.calcStatus == 0,
                 //onClick: handleDelete.bind(null, record),
                 popConfirm: {
                   title: '是否删除?',
@@ -151,7 +151,7 @@
   import MoveModal from './modal/MoveModal.vue';
   import priorityMoadl from './modal/priorityMoadl.vue';
   import { usePermissionStore } from '/@/store/modules/permission';
-  import { getSchemas, getVrColumns, getviewColumns, getviewSchemas } from './data';
+  import { getquanjingSchemas, getVrColumns, getviewColumns, getviewSchemas } from './data';
   import {
     operateSceneList,
     sceneMove,
@@ -201,7 +201,7 @@
         actionColOptions: {
           span: 24,
         },
-        schemas: getSchemas(),
+        schemas: getquanjingSchemas(),
       };
       const [registerPriority, { openModal: openPriorityModal }] = useModal();
       const [registerDownModal, { openModal: openDownModal }] = useModal();