feat(device): external memory and ram

src/api/user.js

@@ -365,7 +365,7 @@ export function addDepartment (data) {
   }, tenantRequest).finally(resetDepartmentCache)
 }
 
-export function updateDepartmentName (data) {
+export function updateDepartment (data) {
   return update({
     url: '/admin/department',
     method: 'PUT',

src/utils/adapter/monitor.js

@@ -77,13 +77,27 @@ export function startMonitor () {
     const timestamp = Number(message.timestamp) || Date.now()
 
     if (result[3] === 'screen') {
-      const { versionName, versionCode, externalUsage, ramUsage, volume } = message
+      const {
+        versionName,
+        versionCode,
+        externalUsage,
+        externalMemoryTotal,
+        externalMemoryUsage,
+        ramUsage,
+        ramUsageOfByte,
+        ramTotalOfByte,
+        volume
+      } = message
       emit(id, 'screen', {
         timestamp,
         versionName,
         versionCode,
         externalUsage,
+        externalMemoryTotal,
+        externalMemoryUsage,
         ramUsage,
+        ramUsageOfByte,
+        ramTotalOfByte,
         volume: transformPercentVolumeToLevelVolume(volume)
       })
       return

src/utils/index.js

@@ -72,7 +72,7 @@ export function createListOptions (params) {
 
 const units = ['B', 'KB', 'M', 'G']
 export function parseByte (byte) {
-  byte |= 0
+  byte = Number(byte)
   if (!byte) {
     return '-'
   }

src/views/device/detail/components/DeviceRuntime/Running.vue

@@ -2,7 +2,9 @@
   <div class="l-flex--col c-device-grid-item has-border radius">
     <div class="l-flex__none l-flex--row c-sibling-item--v">
       <i class="l-flex__none c-sibling-item o-icon" />
-      <span class="l-flex__fill c-sibling-item near u-color--info u-ellipsis">状态</span>
+      <span class="l-flex__fill c-sibling-item near u-color--info u-ellipsis">
+        状态
+      </span>
       <div
         v-if="screen"
         class="u-color--info u-font-size--xs"
@@ -14,11 +16,22 @@
       v-if="screen"
       class="l-flex__fill l-flex--col c-sibling-item--v far u-color--black u-font-size--xs"
     >
-      <div class="c-sibling-item--v">版本 {{ screen.versionName }} {{ screen.versionCode }}</div>
+      <div class="c-sibling-item--v">
+        版本 {{ screen.versionName }} {{ screen.versionCode }}
+      </div>
       <div class="c-sibling-item--v far">
         <div class="l-flex--row c-sibling-item--v">
-          <div class="l-flex__fill">外部存储空间</div>
-          <div :class="externalUsageStatus.color">{{ screen.externalUsage }}%</div>
+          <div class="l-flex__fill">
+            外部存储空间
+          </div>
+          <div :class="externalUsageStatus.color">
+            <span class="c-sibling-item">
+              {{ screen.externalMemory }}
+            </span>
+            <span class="c-sibling-item nearer">
+              {{ screen.externalUsage }}%
+            </span>
+          </div>
         </div>
         <el-progress
           class="c-sibling-item--v nearer"
@@ -29,8 +42,17 @@
       </div>
       <div class="c-sibling-item--v far">
         <div class="l-flex--row c-sibling-item--v">
-          <div class="l-flex__fill">内存</div>
-          <div :class="ramUsageStatus.color">{{ screen.ramUsage }}%</div>
+          <div class="l-flex__fill">
+            内存
+          </div>
+          <div :class="ramUsageStatus.color">
+            <span class="c-sibling-item">
+              {{ screen.ram }}
+            </span>
+            <span class="c-sibling-item nearer">
+              {{ screen.ramUsage }}%
+            </span>
+          </div>
         </div>
         <el-progress
           class="c-sibling-item--v nearer"
@@ -50,7 +72,10 @@
 </template>
 
 <script>
-import { parseTime } from '@/utils'
+import {
+  parseTime,
+  parseByte
+} from '@/utils'
 import {
   addListener,
   removeListener
@@ -122,13 +147,25 @@ export default {
   methods: {
     onMessage ({ screen }) {
       if (screen) {
-        const { timestamp, versionName, versionCode, externalUsage, ramUsage } = screen
+        const {
+          timestamp,
+          versionName,
+          versionCode,
+          externalUsage,
+          externalMemoryTotal,
+          externalMemoryUsage,
+          ramUsage,
+          ramUsageOfByte,
+          ramTotalOfByte
+        } = screen
         this.screen = {
           timestamp: parseTime(timestamp, '{y}-{m}-{d} {h}:{i}:{s}'),
           versionName,
           versionCode,
           externalUsage,
-          ramUsage
+          externalMemory: externalMemoryTotal ? `${parseByte(externalMemoryUsage)} / ${parseByte(externalMemoryTotal)}` : '',
+          ramUsage,
+          ram: ramTotalOfByte ? `${parseByte(ramUsageOfByte)} / ${parseByte(ramTotalOfByte)}` : ''
         }
       }
     }

src/views/platform/debug/index.vue

@@ -8,7 +8,9 @@
   >
     <div class="l-flex__none l-flex--row has-bottom-padding">
       <div class="l-flex__auto l-flex--row c-sibling-item">
-        <span class="c-sibling-item">开启</span>
+        <span class="c-sibling-item">
+          开启
+        </span>
         <el-switch
           v-model="opend"
           class="l-flex__none c-sibling-item"
@@ -29,6 +31,7 @@
         class="l-flex__none c-sibling-item"
         size="small"
         placeholder="请选择设备"
+        filterable
       >
         <el-option
           v-for="item in devices"
@@ -62,15 +65,21 @@
       title="发送消息"
     >
       <div class="c-grid-form u-align-self--center">
-        <span class="c-grid-form__label u-required">topic</span>
+        <span class="c-grid-form__label u-required">
+          topic
+        </span>
         <el-input v-model.trim="mqtt.topic" />
-        <span class="c-grid-form__label">message</span>
+        <span class="c-grid-form__label">
+          message
+        </span>
         <el-input
           v-model.trim="mqtt.message"
           type="textarea"
           :rows="6"
         />
-        <span class="c-grid-form__label">加密</span>
+        <span class="c-grid-form__label">
+          加密
+        </span>
         <div class="l-flex--row c-grid-form__option">
           <el-switch
             v-model="mqtt.encode"

src/views/realm/org/index.vue

@@ -53,15 +53,17 @@
             class="l-flex--row c-contentmenu__item has-active"
             @click="onEditNode"
           >
-            <i class="c-sibling-item el-icon-edit" /><span class="c-sibling-item">
-              重命名
+            <i class="c-sibling-item el-icon-edit" />
+            <span class="c-sibling-item">
+              修改
             </span>
           </div>
           <div
             class="l-flex--row c-contentmenu__item has-active"
             @click="onAddChildNode"
           >
-            <i class="c-sibling-item el-icon-circle-plus-outline" /><span class="c-sibling-item">
+            <i class="c-sibling-item el-icon-circle-plus-outline" />
+            <span class="c-sibling-item">
               新增子部门
             </span>
           </div>
@@ -69,7 +71,8 @@
             class="l-flex--row c-contentmenu__item has-active"
             @click="onDeleteNode"
           >
-            <i class="c-sibling-item el-icon-remove-outline" /><span class="c-sibling-item">
+            <i class="c-sibling-item el-icon-remove-outline" />
+            <span class="c-sibling-item">
               删除
             </span>
           </div>
@@ -131,7 +134,7 @@
 import {
   getDepartments,
   addDepartment,
-  updateDepartmentName,
+  updateDepartment,
   deleteDepartment
 } from '@/api/user'
 
@@ -234,9 +237,10 @@ export default {
         return
       }
       if (this.node.id) {
-        updateDepartmentName(this.node).then(() => {
+        updateDepartment(this.node).then(() => {
           done()
           this.$selectedNode.name = this.node.name
+          this.$selectedNode.priority = this.node.priority
         })
       } else {
         if (!this.node.mark) {