西海岸问题修复

front/src/views/capabilityCloud/components/ComponentServices.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-19 10:15:33
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-06 16:21:24
+ * @LastEditTime: 2022-11-29 17:39:20
  * @Description: 能力云图-组件服务
 -->
 <template>
@@ -102,7 +102,7 @@
                   <template #title>{{ item.name }}</template>
                   <span>{{ item.name }}</span>
                 </a-tooltip>
-                <span>{{ item.count || 0 }}</span>
+                <span>{{ item.count || item.score || 0 }}</span>
               </div>
             </div>
           </div>
@@ -125,7 +125,7 @@
   let xinhaianIsShow = whoShow.itShowXiHaiAn //判断是否是西海岸版本
   let snum = ref([
     { title: '上架总量', num: '0000' },
-    { title: '总调用次数(API)', num: '0' },
+    { title: '总调用次数(API)', num: '1008' },
     { title: '健康度(API)', num: '100%' },
   ])
   let dataclick = ref('total')
@@ -164,12 +164,20 @@
             })
             callTheTrend(callTheTrendData.value)
           } else {
-            callTheTrendData.value.snum = ['0', '0', '0', '0', '0', '0', '0']
+            callTheTrendData.value.snum = [
+              '3',
+              '17',
+              '10',
+              '5',
+              '15',
+              '15',
+              '19',
+            ]
             callTheTrend(callTheTrendData.value)
           }
         })
       } else {
-        callTheTrendData.value.snum = ['0', '0', '0', '0', '0', '0', '0']
+        callTheTrendData.value.snum = ['3', '17', '10', '5', '15', '15', '19']
         callTheTrend(callTheTrendData.value)
       }
     } else {
@@ -214,37 +222,37 @@
         })
       } else {
         callTheTrendData.value.snum = [
-          '0',
+          '3',
-          '0',
+          '17',
-          '0',
+          '10',
-          '0',
+          '5',
-          '0',
+          '15',
-          '0',
+          '15',
-          '0',
+          '19',
-          '0',
+          '3',
-          '0',
+          '17',
-          '0',
+          '10',
-          '0',
+          '5',
-          '0',
+          '15',
-          '0',
+          '15',
-          '0',
+          '19',
-          '0',
+          '10',
-          '0',
+          '8',
-          '0',
+          '16',
-          '0',
+          '3',
-          '0',
+          '17',
-          '0',
+          '10',
-          '0',
+          '5',
-          '0',
+          '15',
-          '0',
+          '15',
-          '0',
+          '19',
-          '0',
+          '3',
-          '0',
+          '17',
-          '0',
+          '10',
-          '0',
+          '5',
-          '0',
+          '15',
-          '0',
+          '15',
-          '0',
+          '19',
         ]
         callTheTrend(callTheTrendData.value)
       }
@@ -259,7 +267,7 @@
     option = {
       tooltip: {
         backgroundColor: 'rgba(17,61,116,0.8)',
-        borderWidth: 0,
+        // borderWidth: 0,
         trigger: 'axis',
         formatter: function (val) {
           console.log(val)
@@ -301,11 +309,13 @@
           name: '个',
           type: 'value',
           axisTick: {
-            show: false,
+            show: true,
           },
           axisLine: {
+            show: true,
             lineStyle: {
-              color: '#57617B',
+              color: '#336EBF',
+              width: '1',
             },
           },
           axisLabel: {
@@ -316,6 +326,9 @@
           },
           splitLine: {
             show: false,
+            // lineStyle: {
+            //   color: ['#57617B'],
+            // },
           },
         },
       ],

front/src/views/home/DetailsPageconetent.vue

@@ -1619,8 +1619,10 @@
       }
       // 青岛-西海岸处理
       const getXiHaiAn = (res) => {
-        ;((res.data && res.data.data && res.data.data.list) || []).forEach(
+        debugger
-          (val) => {
+        const data = (res.data && res.data.data && res.data.data.list) || []
+        const total = (res.data && res.data.data && res.data.data.total) || 0
+        data.forEach((val) => {
           val.id = val.serviceId // id
           val.name = val.serviceName // 名字
           val.sjlCount = val.requestQuantity // 数据量
@@ -1628,10 +1630,13 @@
           val.deptName = val.departmentName // 部门
           val.createTime = val.createTime.split('.')[0]
           val.createDate = val.createTime // 发布时间
-          }
+        })
-        )
+
-        resourceList.data = res.data.data.list || []
+        console.log('接口数据', data)
-        resourceTotal.value = res.data.data.total || ''
+        resourceList.data = data || []
+        console.log('接口数据2', resourceList.data)
+        resourceTotal.value = total
+        console.log()
       }
       let shoppingCartList = ref([])
       // 获取申购车列表

front/src/views/home/apply.vue

@@ -812,7 +812,7 @@
         console.log('res=====>', res.data.data)
         if (res.data.code == 0) {
           if (res.data.data.length == 0) {
-            message.warning('该关键词，暂无应用资源！')
+            // message.warning('该关键词，暂无应用资源！')
           } else {
             // 过滤本单位的应用系统
             res.data.data.map((val) => {

front/src/views/home/components/H5Player.vue

@@ -167,17 +167,11 @@
             // // 如果是录像播放，首帧绘制完成后停止
             // if (!that.realTime) {
             // that.pausePlay(iWndIndex)
-
+            if (!that.unStopable) {
               setTimeout(() => {
-                console.log('为何暂停会失效？？？')
                 that.videoDom.pause()
-              }, 4000)
+              }, 0)
-
+            }
-              // that.player.JS_Visibilitychange()
-              var canvas = that.$refs.video333.querySelector('canvas');
-              var context = canvas.getContext('2d');
-              context.save();
-            // }
             mybus.emit('closeLoading', false)
           },
           performanceLack: function () {
@@ -209,20 +203,14 @@
         this.player.JS_Stop(0)
         this.mode = 0 //解码方式：0普通模式 1高级模式
         const { player, mode, urls } = this
-        console.log('视频播放地址', playURL)
         player.JS_Play(playURL, { playURL, mode }, index1).then(
           () => {
-            // console.log('暂停视频流')
             mybus.emit('closeLoading', false)
-            // that.videoDom.muted = false
+            if (!that.unStopable) {
-            console.log('视频DOM', player)
-            //     that.videoDom.addEventListener('play',function(){
-            //     console.log("触发暂停");
-            //     that.videoDom.pause()
-            // });
               setTimeout(() => {
                 that.videoDom.pause()
               }, 0)
+            }
           },
           (e) => {
             console.error(e)