Casper Dai 2 лет назад
Родитель
Сommit
a7f2977e7b

+ 5 - 6
src/views/device/detail/components/DeviceInvoke/MultifunctionCardPowerSwitch.vue

@@ -786,7 +786,7 @@ export default {
       this.$tasks = tasks
       this.$taskPorts = ports
       this.timingStatus = 1
-      this.$refs.table?.pageTo()
+      this.$refs.table?.pageTo(1)
     },
     setRelayPowerTasks (data) {
       console.log('GET_RELAY_POWER_TIMING', data)
@@ -799,7 +799,7 @@ export default {
       })
       this.$tasks = tasks
       this.timingStatus = 1
-      this.$refs.table?.pageTo()
+      this.$refs.table?.pageTo(1)
     },
     transfromDataToTask ({ type, flag, powerIndex, enable, startTime, endTime, cron }) {
       const strArr = cron[0].split(' ')
@@ -809,8 +809,7 @@ export default {
           ? Frequency.ONCE
           : Frequency.WEEKLY
       return {
-        type, flag, powerIndex, enable, startTime, endTime,
-        freq,
+        type, flag, powerIndex, enable, startTime, endTime, freq,
         freqInfo: this.getFreqInfo(freq, strArr[5]),
         dayOfWeek: freq === Frequency.WEEKLY ? strArr[5] : '',
         executeTime: `${strArr[2].padStart(2, '0')}:${strArr[1].padStart(2, '0')}:${strArr[0].padStart(2, '0')}`
@@ -1052,7 +1051,7 @@ export default {
       if (this.isAdd) {
         task.enable = true
         this.$tasks.unshift(task)
-        this.$refs.table.pageTo()
+        this.$refs.table.pageTo(1)
       } else {
         Object.assign(this.$task, task)
       }
@@ -1062,7 +1061,7 @@ export default {
     onDel (task, index) {
       this.hasChanged = true
       this.$tasks.splice(index, 1)
-      this.$refs.table.pageTo()
+      this.$refs.table.pageTo(1)
     }
   }
 }

+ 5 - 2
src/views/platform/upgrade/deploy/index.vue

@@ -120,6 +120,9 @@ export default {
       apk: '',
       devices: '',
       schema: {
+        props: {
+          size: 'small'
+        },
         list: getVersions,
         buttons: [
           { type: 'add', on: this.onAdd }
@@ -140,7 +143,7 @@ export default {
           { prop: 'fileName', label: '升级文件' },
           { prop: 'versionName', label: '目标版本' },
           { prop: 'deviceName', label: '目标设备' },
-          { label: '升级方式', render () { return '强制升级' } },
+          { label: '升级方式', render: () => '强制升级' },
           { prop: 'createTime', label: '创建时间' },
           { prop: 'remark', label: '备注' },
           { type: 'tag', render ({ status }) {
@@ -148,7 +151,7 @@ export default {
               type: [null, 'warning', 'success', 'info'][status],
               label: [null, '待升级', '已升级', '已废弃'][status]
             }
-          } },
+          }, size: 'sm' },
           { type: 'invoke', render: [
             { label: '删除', on: this.onDel }
           ] }

+ 8 - 5
src/views/platform/upgrade/index.vue

@@ -133,6 +133,9 @@ export default {
       showProgress: false,
       progress: 0,
       schema: {
+        props: {
+          size: 'small'
+        },
         list: getApks,
         buttons: [
           { type: 'add', on: this.onAdd }
@@ -149,19 +152,19 @@ export default {
         ],
         cols: [
           { prop: 'name', label: '文件名' },
-          { prop: 'versionName', label: '版本名称' },
-          { prop: 'versionCode', label: '版本号' },
-          { prop: 'md5', label: 'MD5' },
+          { prop: 'versionName', label: '版本名称', 'min-width': 40 },
+          { prop: 'versionCode', label: '版本号', 'min-width': 40 },
+          { prop: 'md5', label: 'MD5', width: 240 },
           { label: '文件大小', render ({ size }) {
             return parseByte(size)
-          } },
+          }, 'min-width': 40 },
           { prop: 'remark', label: '备注' },
           { type: 'tag', render ({ status }) {
             return {
               type: status ? 'success' : 'danger',
               label: status ? '启用' : '禁用'
             }
-          }, on: this.onTagClick },
+          }, size: 'sm', width: 80, on: this.onTagClick },
           { type: 'invoke', render: [
             { label: '禁用', render ({ status }) { return status === 1 }, on: this.onDeactive },
             { label: '启用', render ({ status }) { return status === 0 }, on: this.onActive },

+ 1 - 0
src/views/realm/user/Account.vue

@@ -165,6 +165,7 @@ export default {
             on: { edit: val => this.onEditName(data, val) }
           }), 'class-name': 'c-edit-column' },
           { label: '消息推送', render: (data, h) => h('el-select', {
+            staticClass: 'u-width',
             props: {
               value: data.informLevel
             },

+ 8 - 5
src/views/realm/user/Settings.vue

@@ -1,5 +1,8 @@
 <template>
-  <div class="l-flex__auto l-flex--col">
+  <div
+    v-loading="loading"
+    class="l-flex__auto l-flex--col"
+  >
     <template v-if="ready">
       <el-tabs
         :value="active"
@@ -167,6 +170,7 @@ export default {
   },
   data () {
     return {
+      loading: true,
       ready: false,
       ignore: false,
       error: false,
@@ -211,7 +215,7 @@ export default {
   },
   methods: {
     async getSettings () {
-      const loading = this.$showLoading()
+      this.loading = true
       this.ready = false
       this.error = false
       try {
@@ -221,14 +225,12 @@ export default {
           const superAdmin = roles.find(({ name }) => name === Role.SUPER_ADMIN)
           if (superAdmin && !this.isSuperAdmin) {
             this.ignore = true
-            this.$closeLoading(loading)
             return
           }
 
           const tenantAdmin = roles.find(({ name }) => name === Role.ADMIN)
           if (tenantAdmin && !this.isSuperAdmin) {
             this.ignore = true
-            this.$closeLoading(loading)
             return
           }
 
@@ -248,8 +250,9 @@ export default {
         this.ready = true
       } catch (e) {
         this.error = true
+      } finally {
+        this.loading = false
       }
-      this.$closeLoading(loading)
     },
     onTabClick (tab) {
       if (this.active !== tab.name) {