update code

.env.production

@@ -1,3 +1,3 @@
 # 代理前缀
-VITE_APP_BASE_API = '/dev-api'
+VITE_APP_BASE_API = '/mk/ai/api/'
 

src/api/device/index.js

@@ -2,7 +2,7 @@ import request from "@/utils/request";
 
 const getStatus=()=>{
     return request({
-        url:'/devices/status',
+        url:'/devices/status/detail',
         method:'get'
     })
 }

src/api/info/index.js

@@ -0,0 +1,11 @@
+import request from "@/utils/request";
+const statistics=()=>{
+    return request({
+        url: "/info/statistics",
+        method: "get"
+      });
+}
+
+export default {
+    statistics
+}

src/utils/request.ts

@@ -35,6 +35,9 @@ service.interceptors.response.use(
       return response;
     }
 
+    if(true){
+      return response;
+    }
     const { code, data, msg } = response.data;
     if (code === ResultEnum.SUCCESS) {
       return data;

src/views/dashboard/index.vue

@@ -25,28 +25,31 @@
           </template>
           <el-scrollbar max-height="504px">
             <el-row :gutter="20">
-        <el-col :span="isSmallScreen?8:6" v-for="it in devInfos" :key="it.id" class="dev-item" style="margin-bottom: 20px;">
+              <el-col :span="isSmallScreen ? 8 : 6" v-for="it in devInfos" :key="it.id" class="dev-item"
+                style="margin-bottom: 20px;">
                 <el-card shadow="hover">
                   <template #header>
-              <div class="dev-title">{{ it.name }}
+                    <div class="dev-title">{{ it.device_name }}
                       <svg-icon icon-class="enlarge" color="#666" />
                     </div>
                   </template>
                   <div class="dev-row2">
                     <div>
-                网络类型:<span>{{ it.netType }}</span>
+                      网络类型:<span>{{ it.modl_net_type }}</span>
                     </div>
                   </div>
                   <div class="dev-row3">
                     <div class="device-state">
 
-                <img style="position: relative;top: -10px;left:-10px;" :src="'images/state/'+it.state+'.png'"/>
-                <div style="font-size:20px;color:#888;position: relative;top: -10px;padding-right:10px;text-align: center;" >{{getState(it.state) }}</div>
+                      <img style="position: relative;top: -10px;left:-10px;" :src="'images/state/' + it.working_state + '.png'" />
+                      <div
+                        style="font-size:20px;color:#888;position: relative;top: -10px;padding-right:10px;text-align: center;">
+                        {{ getState(it.working_state) }}</div>
                     </div>
                     <div class="dev-chart">
                       <div class="chart-item-title">
                         <span>温度</span>
-                  <span>{{ it.temperature }}℃</span>
+                        <span>{{ (it.tempurature/10.0).toFixed() }}℃</span>
                       </div>
                       <div class="chart-line">
                         <div class="chart-line-inline" :style="'width:' + it.temperature + '%'"></div>
@@ -54,18 +57,18 @@
 
                       <div class="chart-item-title">
                         <span>内存</span>
-                  <span>{{ it.memory }}%</span>
+                        <span>{{ it.memory_usage}}MB</span>
                       </div>
                       <div class="chart-line">
-                  <div class="chart-line-inline" :style="'width:' + it.memory + '%'"></div>
+                        <div class="chart-line-inline" :style="'width:' + (it.memory_usage/64/1024.0) + '%'"></div>
                       </div>
 
                       <div class="chart-item-title">
                         <span>CPU</span>
-                  <span>{{ it.cpu }}%</span>
+                        <span>{{ it.cpu_usage }}%</span>
                       </div>
                       <div class="chart-line">
-                  <div class="chart-line-inline" :style="'width:' + it.cpu + '%'"></div>
+                        <div class="chart-line-inline" :style="'width:' + it.cpu_usage + '%'"></div>
                       </div>
 
                     </div>
@@ -116,19 +119,17 @@ import ModelFlow from './components/ModelFlow.vue'
 import IndexNotice from './components/IndexNotice.vue'
 import ServiceStatus from './components/ServiceStatus.vue'
 import DeviceAPI from "@/api/device";
+import InfoApi from '@/api/info'
+
 let svTemp = ref(55.5)
 let rd = () => { return +("" + Math.random()).substring(3, 5) };
 let rd2 = () => { return +("" + Math.random()).substring(3, 4) };
-let topInfos = reactive([
-  { title: '模型总数', count: rd(),ucnt:rd2(), clsName: 'c1', icon: "images/nav/nav1.png" },
-  { title: '算子总数', count: rd(), ucnt:rd2(),clsName: 'c1', icon: "images/nav/nav2.png" },
-  { title: '数据集总数', count: rd(), ucnt:rd2(),clsName: 'c1', icon: "images/nav/nav3.png" },
-  { title: '评估报告总数', count: rd(),ucnt:rd2(), clsName: 'c1', icon: "images/nav/nav4.png" },
-  { title: '互联总数', count: rd(), ucnt:rd2(),clsName: 'c1', icon: "images/nav/nav5.png" },
-  { title: '总访问量', count: rd(), ucnt:rd2(),clsName: 'c1', icon: "images/nav/nav1.png" },
-]);
+let topInfos = ref<any>(null);
 
-let devInfos = reactive([
+
+let devInfos = ref<any>(null)
+/*
+[
   { id: 1001, name: '设备名称1', netType: 'network001', modelName: '模型名称', state: 'offline', temperature: rd(), memory: rd(), cpu: rd() },
   { id: 1002, name: '设备名称2', netType: 'network001', modelName: '模型名称', state: 'compile', temperature: rd(), memory: rd(), cpu: rd() },
   { id: 1003, name: '设备名称3', netType: 'network001', modelName: '模型名称', state: 'free', temperature: rd(), memory: rd(), cpu: rd() },
@@ -141,7 +142,7 @@ let devInfos = reactive([
   { id: 1010, name: '设备名称4', netType: 'network001', modelName: '模型名称', state: 'training', temperature: rd(), memory: rd(), cpu: rd() },
   { id: 1011, name: '设备名称5', netType: 'network001', modelName: '模型名称', state: 'training', temperature: rd(), memory: rd(), cpu: rd() },
   { id: 1012, name: '设备名称6', netType: 'network001', modelName: '模型名称', state: 'training', temperature: rd(), memory: rd(), cpu: rd() },
-])
+]*/
 const winWidth = ref(0)
 const isSmallScreen = computed(() => {
   return winWidth.value < 1440;
@@ -153,19 +154,19 @@ const getState=(e:any)=>{
   if (e == "compile") {
     return "编译中";
   }
-  if(e=="free"){
+  if (e == "idle") {
     return "空闲";
   }
-  if(e=="inferencing"){
+  if (e == "infer") {
     return "推理中";
   }
-  if(e=="noreg"){
+  if (e == "unregist") {
     return "未注册";
   }
-  if(e=="publish"){
+  if (e == "download") {
     return "部署中";
   }
-  if(e=="training"){
+  if (e == "train") {
     return "训练中";
   }
 
@@ -179,8 +180,19 @@ onMounted(()=>{
     }, 100);
   }
   DeviceAPI.getStatus().then(d => {
-    debugger;
+    devInfos.value=d.data.data.device_status_list||[];    
   });
+  InfoApi.statistics().then(d => {
+    topInfos.value = [
+      { title: '模型总数', count: d.data.total_model_count, ucnt: d.data.user_model_count, clsName: 'c1', icon: "images/nav/nav1.png" },
+      { title: '算子总数', count: d.data.total_operator_count, ucnt: d.data.user_operator_count, clsName: 'c1', icon: "images/nav/nav2.png" },
+      { title: '数据集总数', count: d.data.total_dataset_count, ucnt: d.data.user_dataset_count, clsName: 'c1', icon: "images/nav/nav3.png" },
+      { title: '评估报告总数', count: d.data.total_connection_count, ucnt: d.data.user_connection_count, clsName: 'c1', icon: "images/nav/nav4.png" },
+      { title: '互联总数', count: d.data.total_task_count, ucnt: d.data.user_task_count, clsName: 'c1', icon: "images/nav/nav5.png" },
+      { title: '总访问量', count: d.data.total_visit_count, ucnt: d.data.user_visit_count, clsName: 'c1', icon: "images/nav/nav1.png" },
+    ];
+
+  })
 });
 </script>
 
@@ -189,6 +201,7 @@ onMounted(()=>{
   position: relative;
   min-width: 960px;
   padding: 0px 24px;
+
   &.is-small {
     padding: 0px 12px;
   }
@@ -228,54 +241,66 @@ onMounted(()=>{
   &.is-small {
     .dev-row3 {
       padding: 0px !important;
+
       .device-state {
         width: 80px !important;
       }
     }
+
     .right-panel {
       min-width: 240px;
       padding-left: 8px;
     }
+
     .model-flow {
       .card-item {
         width: 100px;
       }
+
       .row-1 {
         .line {
           width: calc(20% - 100px);
           top: 10px;
         }
       }
+
       .row-3 {
         .line {
           width: calc(20% - 100px);
         }
+
         .card-center {
           .card-center-item {
             width: 100px;
+
             &:first-child {
               &::after {
                 left: 50px;
               }
+
               &::before {
                 left: 50px;
               }
             }
+
             &:last-child {
               &::after {
                 left: -20px;
               }
+
               &::before {
                 left: 51px;
               }
             }
           }
         }
+
         .card-item {
           &.line-top {
             &::after {
               left: 50px;
             }
+
             &::before {
               left: 48px;
             }
@@ -284,10 +309,12 @@ onMounted(()=>{
       }
     }
   }
+
   .right-panel {
     min-width: 300px;
     padding-left: 12px;
   }
+
   .el-card__body {
     padding: 10px 10px;
   }
@@ -338,15 +365,18 @@ onMounted(()=>{
       .el-card__header {
         border-bottom: 1px solid #ebeef5;
       }
+
       .el-card__body {
         .el-scrollbar {
           padding: 10px;
         }
       }
     }
+
     .el-card__header {
       padding: 8px;
       border: none;
+
       .row2-top {
         position: relative;
 
@@ -359,10 +389,13 @@ onMounted(()=>{
 
       }
     }
+
     .el-card__body {
       padding: 0px;
+
       .el-scrollbar {
         padding: 0px 10px;
+
         .el-scrollbar__bar.is-horizontal {
           display: none;
         }
@@ -397,22 +430,28 @@ onMounted(()=>{
           box-shadow: var(--el-box-shadow-light);
           border-radius: 8px;
           padding: 10px;
+
           .dev-row3 {
             display: flex;
             padding: 12px;
             align-items: center;
+
             .device-state {
               width: 100px;
               text-align: center;
             }
+
             .state-text {
               font-size: 16px;
+
               &.state0 {
                 color: var(--el-color-primary);
               }
+
               &.state1 {
                 color: var(--el-color-warning);
               }
+
               &.state2 {
                 color: var(--el-color-danger);
               }
@@ -422,24 +461,29 @@ onMounted(()=>{
               flex-grow: 1;
               position: relative;
               top: -10px;
+
               .chart-item-title {
                 margin: 12px 0px 0px;
                 font-size: 12px;
                 position: relative;
+
                 span {
                   &:first-child {
                     font-weight: bold;
                   }
+
                   &:last-child {
                     position: absolute;
                     right: 0px;
                   }
                 }
               }
+
               .chart-line {
                 background-color: #ccc;
                 height: 8px;
                 border-radius: 4px;
+
                 .chart-line-inline {
                   background-color: var(--el-color-primary);
                   height: 8px;
@@ -453,23 +497,28 @@ onMounted(()=>{
       }
     }
   }
+
   .proc-card {
     margin-top: 20px;
     padding: 8px;
+
     .el-card__header {
       padding: 8px;
       border: none;
     }
+
     .el-card__body {
       background: #EEF7FE;
       border-radius: 8px;
       height: 300px;
     }
+
     &.server-status {
       background: #EEF7FE;
       padding: 8px;
-      .el-card__header{
-      }
+
+      .el-card__header {}
+
       .el-card__body {
         background: #fff;
         box-shadow: var(--el-box-shadow-light);

tsconfig.json

@@ -26,6 +26,7 @@
   },
   "include": [
     "src/**/*.ts",
+    "src/**/*.js",
     "src/**/*.vue",
     "src/typings/**/*.d.ts",
     "mock/**/*.ts",