Эх сурвалжийг харах

refactor: adjust some styles

Casper Dai 2 жил өмнө
parent
commit
4e318f8026

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

@@ -77,8 +77,6 @@ export default {
           __SUB_DEVICE__
           __SUB_DEVICE__
             ? { label: '设备名称', render: (data, h) => data.empty ? h('span', { staticClass: 'u-color--info' }, '暂无备份设备') : data.name, 'min-width': 120 }
             ? { label: '设备名称', render: (data, h) => data.empty ? h('span', { staticClass: 'u-color--info' }, '暂无备份设备') : data.name, 'min-width': 120 }
             : { prop: 'name', label: '设备名称', 'min-width': 120 },
             : { prop: 'name', label: '设备名称', 'min-width': 120 },
-          { prop: 'serialNumber', label: '序列号', 'min-width': 140 },
-          { prop: 'mac', label: 'MAC', 'min-width': 140 },
           { type: 'tag', render: ({ empty, activate, onlineStatus }) => empty
           { type: 'tag', render: ({ empty, activate, onlineStatus }) => empty
             ? null
             ? null
             : activate
             : activate
@@ -88,6 +86,12 @@ export default {
                   ? { type: 'success', label: '在线' }
                   ? { type: 'success', label: '在线' }
                   : { type: 'danger', label: '离线' }
                   : { type: 'danger', label: '离线' }
               : { type: 'warning', label: '未激活' }, 'width': 120, 'align': 'center' },
               : { type: 'warning', label: '未激活' }, 'width': 120, 'align': 'center' },
+          { label: '运行时间', render: ({ empty, openTime, closeTime }) => empty
+            ? null
+            : openTime && closeTime
+              ? `${openTime} - ${closeTime}`
+              : '-', 'min-width': 100 },
+          { prop: 'address', label: '地址', 'min-width': 160 },
           { type: 'invoke', width: canEdit ? 240 : 80, render: [
           { type: 'invoke', width: canEdit ? 240 : 80, render: [
             canEdit ? { label: '默认播放', render: ({ isMaster, activate }) => isMaster && activate, on: this.onSetDefaultProgram } : null,
             canEdit ? { label: '默认播放', render: ({ isMaster, activate }) => isMaster && activate, on: this.onSetDefaultProgram } : null,
             canEdit ? { label: '素材包绑定', render: ({ isMaster, activate }) => isMaster && activate, on: this.onSetDataset } : null,
             canEdit ? { label: '素材包绑定', render: ({ isMaster, activate }) => isMaster && activate, on: this.onSetDataset } : null,

+ 1 - 1
src/views/external/camera/index.vue

@@ -96,7 +96,7 @@ export default {
           { type: 'tag', render: ({ onlineStatus }) => onlineStatus === 1
           { type: 'tag', render: ({ onlineStatus }) => onlineStatus === 1
             ? { type: 'success', label: '在线' }
             ? { type: 'success', label: '在线' }
             : { type: 'danger', label: '离线' } },
             : { type: 'danger', label: '离线' } },
-          { type: 'tag', render: ({ bound }) => bound
+          { label: '绑定状态', type: 'tag', render: ({ bound }) => bound
             ? { type: 'success', label: '已绑定' }
             ? { type: 'success', label: '已绑定' }
             : { type: 'primary', label: '未绑定' } },
             : { type: 'primary', label: '未绑定' } },
           { prop: 'remark', label: '备注' },
           { prop: 'remark', label: '备注' },

+ 1 - 1
src/views/external/gateway/index.vue

@@ -112,7 +112,7 @@ export default {
           { type: 'tag', render: ({ status }) => status === 1
           { type: 'tag', render: ({ status }) => status === 1
             ? { type: 'success', label: '在线' }
             ? { type: 'success', label: '在线' }
             : { type: 'danger', label: '离线' } },
             : { type: 'danger', label: '离线' } },
-          { type: 'tag', render: ({ bound }) => bound
+          { label: '绑定状态', type: 'tag', render: ({ bound }) => bound
             ? { type: 'success', label: '已绑定' }
             ? { type: 'success', label: '已绑定' }
             : { type: 'primary', label: '未绑定' } },
             : { type: 'primary', label: '未绑定' } },
           { prop: 'remark', label: '备注' },
           { prop: 'remark', label: '备注' },

+ 16 - 2
src/views/realm/device/index.vue

@@ -91,7 +91,6 @@ export default {
     return {
     return {
       schema: {
       schema: {
         keepalive: true,
         keepalive: true,
-        condition: { name: '' },
         list: getDevices,
         list: getDevices,
         transform: this.transform,
         transform: this.transform,
         transformData: __SUB_DEVICE__ && this.transformTableData,
         transformData: __SUB_DEVICE__ && this.transformTableData,
@@ -110,9 +109,24 @@ export default {
           __SUB_DEVICE__
           __SUB_DEVICE__
             ? { label: '设备名称', render: (data, h) => data.empty ? h('span', { staticClass: 'u-color--info' }, '暂无备份设备') : data.name, 'min-width': 120 }
             ? { label: '设备名称', render: (data, h) => data.empty ? h('span', { staticClass: 'u-color--info' }, '暂无备份设备') : data.name, 'min-width': 120 }
             : { prop: 'name', label: '设备名称', 'min-width': 120 },
             : { prop: 'name', label: '设备名称', 'min-width': 120 },
-          { prop: 'productName', label: '配置' },
           { prop: 'serialNumber', label: '序列号' },
           { prop: 'serialNumber', label: '序列号' },
           { prop: 'mac', label: 'MAC' },
           { prop: 'mac', label: 'MAC' },
+          { label: '运行时间', render: ({ empty, openTime, closeTime }) => empty
+            ? ''
+            : openTime && closeTime
+              ? `${openTime} - ${closeTime}`
+              : '-' },
+          { label: '坐标', type: 'tag', render: ({ empty, longitude, latitude }) => empty
+            ? null
+            : longitude && latitude
+              ? {
+                type: 'success',
+                label: '已设置'
+              }
+              : {
+                type: 'warning',
+                label: '未设置'
+              } },
           { prop: 'address', label: '地址', 'min-width': 100 },
           { prop: 'address', label: '地址', 'min-width': 100 },
           { type: 'tag', render: ({ empty, activate, onlineStatus }) => empty
           { type: 'tag', render: ({ empty, activate, onlineStatus }) => empty
             ? null
             ? null