Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev

@@ -21,13 +21,13 @@
           <el-descriptions title="license文件信息" :column="3" border>
           <el-descriptions title="license文件信息" :column="3" border>
 
 
             <el-descriptions-item label="授权状态" label-align="right" align="center">
             <el-descriptions-item label="授权状态" label-align="right" align="center">
-                正常
+              {{tableData.authorizeStats}}
             </el-descriptions-item>
             </el-descriptions-item>
             <el-descriptions-item label="授权时间" label-align="right" align="center">
             <el-descriptions-item label="授权时间" label-align="right" align="center">
-                2022-08-23
+              {{tableData.authorizeTime}}
             </el-descriptions-item>
             </el-descriptions-item>
             <el-descriptions-item label="剩余" label-align="right" align="center">
             <el-descriptions-item label="剩余" label-align="right" align="center">
-              <el-tag size="small">2天</el-tag>
+              <el-tag size="small">{{tableData.timeLeft}}天</el-tag>
             </el-descriptions-item>
             </el-descriptions-item>
           </el-descriptions>
           </el-descriptions>
         </el-col>
         </el-col>
@@ -46,13 +46,14 @@
       >
       >
         <template #default="{row,prop,column}">
         <template #default="{row,prop,column}">
           <div v-if="row.usage == '已使用'">
           <div v-if="row.usage == '已使用'">
-            <span v-if="prop == 'resNum'" :style="{'color':tableData.dataList[1].resNum>=tableData.dataList[0].resNum?'red':''}">{{row.resNum}}</span>
-            <span v-if="prop != 'resNum'">
+            <span v-if="tableData.dataList[1][prop]>tableData.dataList[0][prop]" :style="{'color':'red'}">{{row[prop]}}</span>
+            <span v-else>
               {{row[prop]}}
               {{row[prop]}}
             </span>
             </span>
             <el-tooltip
             <el-tooltip
                     effect="dark"
                     effect="dark"
                     placement="bottom"
                     placement="bottom"
+                    v-if="tableData.dataList[1][prop]>tableData.dataList[0][prop]"
             >
             >
               <template #content>
               <template #content>
                 <div>
                 <div>

@@ -13,6 +13,9 @@ export default {
         let tableData = Vue.ref({
         let tableData = Vue.ref({
             count: 0,
             count: 0,
             dataList: [],
             dataList: [],
+            authorizeStats: '',
+            authorizeTime:'',
+            timeLeft:'',
             columns: [
             columns: [
                 {
                 {
                     prop: 'usage',
                     prop: 'usage',
@@ -30,7 +33,7 @@ export default {
                 },
                 },
                  {
                  {
                     prop: 'protocolCate',
                     prop: 'protocolCate',
-                    label: '协议',
+                    label: '协议（只统计已挂载任务的资源）',
                     align: 'center',
                     align: 'center',
                     columns:[]
                     columns:[]
                 }
                 }
@@ -144,6 +147,14 @@ export default {
                     dataList.local.usage='已使用';
                     dataList.local.usage='已使用';
                     tableData.value.dataList[0] = dataList.license;
                     tableData.value.dataList[0] = dataList.license;
                     tableData.value.dataList[1] = dataList.local;
                     tableData.value.dataList[1] = dataList.local;
+                    if (dataList.authorizeStats){
+                        tableData.value.authorizeStats = '已授权';
+                    }else {
+                        tableData.value.authorizeStats = '未授权';
+                    }
+                    tableData.value.authorizeTime = dataList.authorizeTime;
+                    tableData.value.timeLeft = dataList.timeLeft;
+
                 } else {
                 } else {
                     tableData.value.dataList = [];
                     tableData.value.dataList = [];
                 }
                 }
@@ -175,6 +186,7 @@ export default {
             proxy.$http.uploadFile("/api-web/license/uploadZip", params, function (res) {
             proxy.$http.uploadFile("/api-web/license/uploadZip", params, function (res) {
                 if (res && res.success) {
                 if (res && res.success) {
                     proxy.$global.showMsg("上传成功！");
                     proxy.$global.showMsg("上传成功！");
+                    getDataList();
                 }
                 }
             })
             })
         }
         }

@@ -11,7 +11,7 @@ server:
     key-store-password: Hg0801..
     key-store-password: Hg0801..
     key-password: Hg0801..
     key-password: Hg0801..
 url:
 url:
-  gateway: http://192.168.1.53:8080
+  gateway: http://127.0.0.1:8080
   inspection_web: http://127.0.0.1:8082
   inspection_web: http://127.0.0.1:8082
   assetsweb: http://127.0.0.1:8082
   assetsweb: http://127.0.0.1:8082
   mxgraph_editor: http://127.0.0.1:8085
   mxgraph_editor: http://127.0.0.1:8085