浏览代码

fix: the data display of some tables is incomplete

write pagination as paination
Casper Dai 2 年之前
父节点
当前提交
8a1f517ea9

+ 2 - 2
src/views/ad/automation/dataset/index.vue

@@ -164,8 +164,8 @@ export default {
         ],
         cols: [
           { type: 'selection' },
-          { prop: 'name', label: '名称' },
-          { prop: 'address', label: '地址', 'min-width': 120 },
+          { prop: 'name', label: '设备名称' },
+          { prop: 'address', label: '地址' },
           { type: 'invoke', render: [
             { label: '解绑', on: this.onUnbind }
           ] }

+ 2 - 6
src/views/device/group/index.vue

@@ -69,7 +69,6 @@ export default {
       isAdd: false,
       currObj: {},
       schema: {
-        condition: { name: '' },
         list: getDeviceGroups,
         buttons: [
           { type: 'add', on: this.onAdd }
@@ -88,15 +87,13 @@ export default {
         ]
       },
       subDeviceSchema: {
-        singlePage: true,
+        nonPagination: true,
         list: this.getDevicesByGroup,
         buttons: [
           { type: 'add', label: '添加设备', on: this.onAddDevice }
         ],
         cols: [
           { prop: 'name', label: '设备名称' },
-          { prop: 'serialNumber', label: '序列号' },
-          { prop: 'mac', label: 'MAC' },
           { prop: 'address', label: '地址' },
           { type: 'invoke', render: [
             { label: '移除', on: this.onDelDevice }
@@ -104,11 +101,10 @@ export default {
         ]
       },
       deviceSchema: {
-        condition: { name: '' },
+        list: getDevices,
         filters: [
           { key: 'name', type: 'search', placeholder: '设备名称' }
         ],
-        list: getDevices,
         cols: [
           { prop: 'name', label: '设备名称' },
           { prop: 'address', label: '地址' }

+ 1 - 1
src/views/device/index.vue

@@ -67,7 +67,7 @@ export default {
           { prop: 'address', label: '地址', 'min-width': 160 },
           { type: 'invoke', render: [
             { label: '详情', render: ({ isMaster }) => isMaster, on: this.onViewDevice }
-          ].filter(Boolean), width: 80 }
+          ] }
         ]
       }
     }

+ 1 - 3
src/views/realm/ai/ai-timing/index.vue

@@ -52,9 +52,7 @@ export default {
           { key: 'name', type: 'search', placeholder: '设备名称' }
         ],
         cols: [
-          { prop: 'name', label: '设备名称', 'min-width': 120 },
-          { prop: 'serialNumber', label: '序列号', 'min-width': 140 },
-          { prop: 'mac', label: 'MAC', 'min-width': 140 },
+          { prop: 'name', label: '设备名称' },
           { prop: 'address', label: '地址' },
           { type: 'invoke', width: 180, render: [
             { label: '服务配置', on: this.onDeviceServiceConfig },

+ 1 - 1
src/views/realm/assign/Device.vue

@@ -58,7 +58,7 @@ export default {
           { prop: 'name', label: '设备名称' },
           { label: '归属部门', render: ({ org }) => org ? this.groupMap[org] || '未知' : '-' },
           { prop: 'address', label: '地址' },
-          { type: 'invoke', width: 100, render: [
+          { type: 'invoke', render: [
             { label: '移除', on: this.onDel }
           ] }
         ]

+ 1 - 1
src/views/screen/review/workflow/audit/components/ReviewAssets.vue

@@ -23,7 +23,7 @@ export default {
   data () {
     return {
       schema: {
-        nonPaination: true,
+        nonPagination: true,
         list: this.getList,
         cols: [
           { prop: 'tagInfo', label: '类型', width: 80, align: 'center' },

+ 1 - 1
src/views/screen/review/workflow/audit/components/ReviewPrograms.vue

@@ -13,7 +13,7 @@ export default {
   computed: {
     schema () {
       return {
-        nonPaination: true,
+        nonPagination: true,
         list: this.getList,
         cols: [
           { prop: 'file', label: '缩略图', type: 'asset', on: this.onView },

+ 1 - 1
src/views/screen/review/workflow/audit/components/ReviewPublish.vue

@@ -116,7 +116,7 @@ export default {
         ]
       },
       programAssetSchema: {
-        nonPaination: true,
+        nonPagination: true,
         list: this.getContentAssets,
         cols: [
           { prop: 'tagInfo', label: '类型', width: 80, align: 'center' },

+ 1 - 1
src/views/screen/review/workflow/audit/components/ReviewRecurPrograms.vue

@@ -13,7 +13,7 @@ export default {
   data () {
     return {
       schema: {
-        nonPaination: true,
+        nonPagination: true,
         list: this.getList,
         cols: [
           { prop: 'name', label: '轮播名称' },