Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev

2022-07-01 14:03:42 +08:00 · 2022-07-01 14:03:42 +08:00 · 2b01c0efa4
parent e7bc4e8f0c 2e3db9a60d
commit 2b01c0efa4
5 changed files with 162 additions and 55 deletions
--- a/back/src/views/modules/activiti/demo/putaway-process.vue
+++ b/back/src/views/modules/activiti/demo/putaway-process.vue
@ -131,7 +131,7 @@
          </el-form-item>
          <el-form-item label="接口请求方式"  v-if="coverageNotShow">
            <el-input
-              v-model="dataForm.applyCount"
+              v-model="dataForm.apiMethodType"
              :disabled="fieldDisabled"
              placeholder="接口请求方式"
            ></el-input>
--- a/front/src/api/capabilityCloud.js
+++ b/front/src/api/capabilityCloud.js
@ -80,3 +80,17 @@ export function dataResourceInfo(params) {
    params,
  })
 }
+//能力云图-调用趋势
+export function callTheTrendPort(start, end, params) {
+  return request({
+    url: '/metrics/api/v1/query_range?query=sum(increase(apigateway_http_status%5B1d%5D))&start=' + start + '&end=' + end + '&step=' + params,
+    method: 'get',
+  })
+}
+//能力云图-调用次数
+export function totalCallsSnum(params) {
+  return request({
+    url: '/metrics/api/v1/query?query=sum(apigateway_http_status)&time=1655793262.495' + params,
+    method: 'get',
+  })
+}
--- a/front/src/views/capabilityCloud/components/ComponentServices.vue
+++ b/front/src/views/capabilityCloud/components/ComponentServices.vue
@ -117,6 +117,8 @@
  import {
    assemblerBaseStatic,
    componentServiceRank,
+    callTheTrendPort,
+    totalCallsSnum,
  } from '@/api/capabilityCloud'
  import * as moment from 'moment'
  let snum = ref([
@ -145,20 +147,50 @@
          .subtract('days', 6 - i)
          .format('MM-DD')
        callTheTrendData.value.time.push(time)
-        callTheTrendData.value.snum.push('0')
        console.log('time', callTheTrendData.value, name)
      }
+      const start = parseInt(
+        (Date.parse(new Date()) - 168 * 60 * 60 * 1000) / 1000
+      )
+      const end = Date.parse(new Date()) / 1000
+      callTheTrendPort(start, end, 86400).then((res) => {
+        if (res.data.data.result) {
+          res.data.data.result[0].values.splice(0, 1)
+          res.data.data.result[0].values.map((item) => {
+            callTheTrendData.value.snum.push(parseInt(item[1]))
+          })
          callTheTrend(callTheTrendData.value)
+        } else {
+          callTheTrendData.value.snum = ['0', '0', '0', '0', '0', '0', '0']
+          callTheTrend(callTheTrendData.value)
+        }
+      })
    } else {
      for (let i = 0; i < 31; i++) {
        let time = moment()
          .subtract('days', 30 - i)
          .format('MM-DD')
        callTheTrendData.value.time.push(time)
-        callTheTrendData.value.snum.push('0')
        console.log('time', callTheTrendData.value, name)
      }
+      const start = parseInt(
+        (Date.parse(new Date()) - 720 * 60 * 60 * 1000) / 1000
+      )
+      const end = Date.parse(new Date()) / 1000
+      callTheTrendPort(start, end, 86400).then((res) => {
+        if (res.data.data.result) {
+          // res.data.data.result.splice(0, 1)
+          res.data.data.result[0].values.map((item) => {
+            callTheTrendData.value.snum.push(parseInt(item[1]))
+          })
          callTheTrend(callTheTrendData.value)
+        } else {
+          for (let i = 0; i < 30; i++) {
+            callTheTrendData.value.snum.push('0')
+          }
+          callTheTrend(callTheTrendData.value)
+        }
+      })
    }
  }
  //调用趋势echarts图
@ -316,10 +348,18 @@
      })
    })
  }
+  //总调用次数接口
+  const TotalCallsAPI = () => {
+    const end = Date.parse(new Date()) / 1000
+    totalCallsSnum(end).then((res) => {
+      snum.value[1].num = res.data.data.result[0].value[1]
+    })
+  }
  const init = () => {
    timeSwitch(timeSwitchindex.value)
    NumberOfComponentServices()
    ranking(dataclick.value)
+    TotalCallsAPI()
  }
  onMounted(() => {
    init()
--- a/front/src/views/personalCenter/components/ApplyDetails.vue
+++ b/front/src/views/personalCenter/components/ApplyDetails.vue
@ -432,7 +432,7 @@
        </a-form-item>
        <a-form-item label="接口请求方式">
          <a-input
-            v-model:value="dataForm.data.applyCount"
+            v-model:value="dataForm.data.apiMethodType"
            disabled="true"
            placeholder="接口请求方式"
          ></a-input>
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@ -48,8 +48,13 @@
          <a-tooltip>
            <template #title>{{ item.name }}</template>
            <div class="content-body-title">
-              <span v-if="item.name ==='申请摄像头列表'" @click="showVideoList(item)"> 名称：{{ item.name }} </span>
-              <span v-else> 名称：{{ item.name }} </span>
+              <span
+                v-if="item.name === '申请摄像头列表'"
+                @click="showVideoList(item)"
+              >
+                名称：{{ item.name }}
+              </span>
+              <span v-else>名称：{{ item.name }}</span>
              <div></div>
            </div>
          </a-tooltip>
@ -72,7 +77,18 @@
          </div>
          <div v-else>
            <p class="content-body-content-son">
-              <span v-if="item.name ==='申请摄像头列表'">申请结果：{{ '列表地址：' + backUrl +  'resource/getApplyCameraList/' + item.processInstanceId+';'+ '视频流地址：'+backUrl + '/resource/hls/getHls/?channelId='}}</span>
+              <span v-if="item.name === '申请摄像头列表'">
+                申请结果：{{
+                  '列表地址：' +
+                  backUrl +
+                  'resource/getApplyCameraList/' +
+                  item.processInstanceId +
+                  ';' +
+                  '视频流地址：' +
+                  backUrl +
+                  '/resource/hls/getHls/?channelId='
+                }}
+              </span>
              <span v-else>申请结果：{{ item.comment || '暂无' }}</span>
              <a-button
                type="primary"
@ -225,9 +241,14 @@
    <a-modal
      v-model:visible="videoVisible"
      title="已申请摄像头列表"
-      @ok="videoVisible=false"
+      @ok="videoVisible = false"
+    >
+      <a-table
+        :columns="columns"
+        :data-source="xVideoList"
+        bordered
+        :pagination="{ defaultPageSize: 6 }"
      >
-      <a-table :columns="columns" :data-source="xVideoList" bordered :pagination="{defaultPageSize: 6}">
        <template #bodyCell="{ column, text }">
          <!-- <template>
        <a>{{ text }}</a>
@ -246,7 +267,12 @@
    getTaskHandleDetailInfo,
    // getProcDefBizRoute,
  } from '@/api/personalCenter'
-  import { updateRes, relaunch, selectOne,getApplyCameraList } from '@/api/home'
+  import {
+    updateRes,
+    relaunch,
+    selectOne,
+    getApplyCameraList,
+  } from '@/api/home'
  import { useRouter } from 'vue-router'
  import { message } from 'ant-design-vue'
  import ApplyDetails from '@/views/personalCenter/components/ApplyDetails'
@ -257,39 +283,56 @@
  // let contentListLength = contentList.length
  let tabIndex = ref(0)
  const videoVisible = ref(false)
-  const columns = ref([{
+  const columns = ref([
+    {
      title: '摄像头名称',
-    dataIndex: 'name'
-  }])
-  const xVideoList = ref([{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },{
-    name: '111'
-  }, {
-    name: '222'
-  },])
+      dataIndex: 'name',
+    },
+  ])
+  const xVideoList = ref([
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+  ])
  function tabqiehuan(item, index) {
    // debugger
    tabIndex.value = index
@ -636,13 +679,23 @@
          line-height: 16px;
          font-size: 12px;
          width: 100%;
-          text-overflow: -o-ellipsis-lastline;
+          // text-overflow: -o-ellipsis-lastline;
+          // overflow: hidden;
+          // text-overflow: ellipsis;
+          // display: -webkit-box;
+          // -webkit-line-clamp: 3;
+          // -webkit-box-orient: vertical;
+          display: flex;
+          color: #999999;
+          span {
            overflow: hidden;
            text-overflow: ellipsis;
            display: -webkit-box;
-          -webkit-line-clamp: 3;
+            -webkit-line-clamp: 1;
            -webkit-box-orient: vertical;
-          color: #999999;
+            max-width: 8.1rem;
+            line-height: 24px;
+          }
        }
        .content-body-bottom {
          display: flex;