tts

src/views/corporation/deviceModal.vue

@@ -28,7 +28,7 @@
           >
             <template #addonBefore>
               <a-button
-                :disabled="modelRef.mappingLength == 0"
+                :disabled="modelRef.mappingLength == 0 || model[field] == 1"
                 size="small"
                 type="link"
                 @click="handleMinusDevice"
@@ -154,7 +154,7 @@
           field: 'deviceNumber',
           component: 'InputNumber',
           label: t('routes.corporation.cameraNum'),
-          defaultValue: 0,
+          defaultValue: 1,
           slot: 'subNum',
           colProps: {
             span: 8,
@@ -226,7 +226,7 @@
         await setFieldsValue({
           ...data.record,
           subNum: 0,
-          deviceNumber: 0,
+          deviceNumber: 1,
         });
         deviceMapping();
       }
@@ -239,7 +239,7 @@
         // numOnChange(0);
         await setFieldsValue({
           subNum: 0,
-          deviceNumber: 0,
+          deviceNumber: 1,
         });
         deviceMapping();
       }
@@ -277,7 +277,7 @@
 
       async function deviceMapping() {
         const values = getFieldsValue();
-        const devices: number = clamp(values.deviceNumber, 0, maxLength.value);
+        const devices: number = clamp(values.deviceNumber, 1, maxLength.value);
         const currentLength = unref(modelRef).mappingLength;
 
         const rest = devices - currentLength;

src/views/scenes/list.vue

@@ -448,7 +448,7 @@
           },
         ],
       };
-      const [registerTable, { reload, getSelectRowKeys, clearSelectedRowKeys }] = useTable({
+      const [registerTable, { reload, getSelectRows, clearSelectedRowKeys }] = useTable({
         //title: t('routes.scenes.sceneList'),
         api: ListApi,
         columns: columns,
@@ -466,10 +466,14 @@
         },
         afterFetch: (T) => {
           loading.value = false;
-          if(T.isFolder){
-            T.num = T.id;
-          }
-          return T;
+
+          console.log('T', T);
+          return T.map(item => {
+            if(item.isFolder == 1){
+              item.num = item.id;
+            }
+            return item;
+          });
         },
       });
       async function handleGenerate(record: Recordable) {
@@ -614,8 +618,16 @@
         openfolderModal(true, record);
       }
       function handlePatchSelect() {
-        const keys = getSelectRowKeys();
-        if (keys.length > 0) {
+        let keys: any[] = [], folderIdList = [];
+        const list = getSelectRows();
+        list.map(ele => {
+          if(ele.isFolder == 1){
+            folderIdList.push(ele.id);
+          }else{
+            keys.push(ele.num);
+          }
+        })
+        if (keys.length > 0  || folderIdList.length > 0) {
           createConfirm({
             iconType: 'warning',
             title: () => h('span', t('routes.archive.patchArchive')),
@@ -624,6 +636,7 @@
               try {
                 await patchcoldStorageApi({
                   numList: keys,
+                  folderIdList: folderIdList,
                 });
                 createMessage.success(t('common.optSuccess'));
                 clearSelectedRowKeys();