From fc524a6b4305a93fd858ccec142bf8a50bcd2378 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 28 Jul 2022 17:12:30 +0800
Subject: [PATCH 01/10] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/router/index.js                      |  6 +-
 .../views/modules/sys/user-add-or-update.vue  | 65 ++++++++++++-------
 2 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/back/src/router/index.js b/back/src/router/index.js
index b2f3777e..c386dc1b 100644
--- a/back/src/router/index.js
+++ b/back/src/router/index.js
@@ -5,10 +5,9 @@ import { isURL } from '@/utils/validate'
 import store from '@/store'
 import Cookies from 'js-cookie'
 
-
 // 解决ElementUI导航栏中的vue-router在3.0版本以上重复点菜单报错问题
 const originalPush = Router.prototype.push
-Router.prototype.push = function push(location) {
+Router.prototype.push = function push (location) {
   return originalPush.call(this, location).catch(err => err)
 }
 
@@ -42,7 +41,8 @@ export const moduleRoutes = {
   meta: { title: '主入口布局' },
   children: [
     // todos 临时调整，后期去掉
-    { path: '/home', redirect: '/bscatalogue-bscatalogue', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } },
+    // { path: '/home', redirect: '/bscatalogue-bscatalogue', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } },
+    { path: '/home', redirect: '/workBench-workBench', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } },
     { path: '/iframe', component: null, name: 'iframe', meta: { title: 'iframe', isTab: true } }
   ]
 }
diff --git a/back/src/views/modules/sys/user-add-or-update.vue b/back/src/views/modules/sys/user-add-or-update.vue
index e8537498..c366c760 100644
--- a/back/src/views/modules/sys/user-add-or-update.vue
+++ b/back/src/views/modules/sys/user-add-or-update.vue
@@ -56,6 +56,7 @@ import { isEmail, isMobile } from '@/utils/validate'
 export default {
   data () {
     return {
+      submitFlag: true,
       visible: false,
       roleList: [],
       roleIdListDefault: [],
@@ -170,6 +171,22 @@ export default {
         ]).then(() => {
           if (this.dataForm.id) {
             this.getInfo()
+          } else {
+            this.dataForm = {
+              id: '',
+              username: '',
+              deptId: '',
+              deptName: '',
+              password: '',
+              confirmPassword: '',
+              realName: '',
+              gender: 0,
+              email: '',
+              mobile: '',
+              roleIdList: [],
+              postIdList: [],
+              status: 1
+            }
           }
         })
       })
@@ -219,30 +236,34 @@ export default {
         if (!valid) {
           return false
         }
-        this.dataForm.password = Encrypt(this.dataForm.password)
-        if (this.dataForm.id) {
-          delete this.dataForm.password
-        }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/user', {
-          ...this.dataForm,
-          roleIdList: [
-            ...this.dataForm.roleIdList,
-            ...this.roleIdListDefault
-          ]
-        }).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
+        if (this.submitFlag) {
+          this.submitFlag = false
+          this.dataForm.password = Encrypt(this.dataForm.password)
+          if (this.dataForm.id) {
+            delete this.dataForm.password
           }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
+          this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/user', {
+            ...this.dataForm,
+            roleIdList: [
+              ...this.dataForm.roleIdList,
+              ...this.roleIdListDefault
+            ]
+          }).then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg)
             }
-          })
-        }).catch(() => {})
+            this.$message({
+              message: this.$t('prompt.success'),
+              type: 'success',
+              duration: 500,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refreshDataList')
+              }
+            })
+            this.submitFlag = true
+          }).catch(() => {})
+        }
       })
     }, 1000, { leading: true, trailing: false })
   }

From ea3f4b3da1f4dbf38de092473f0cc936836d121a Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 28 Jul 2022 17:23:57 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=81=AE=E7=BD=A9=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/activiti/demo/putaway-process3.vue      | 1 +
 back/src/views/modules/myAgent/demo/ability-resource-shelf.vue | 1 +
 back/src/views/modules/myAgent/demo/competency-application.vue | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/back/src/views/modules/activiti/demo/putaway-process3.vue b/back/src/views/modules/activiti/demo/putaway-process3.vue
index 9837ee1a..4f1e12cc 100644
--- a/back/src/views/modules/activiti/demo/putaway-process3.vue
+++ b/back/src/views/modules/activiti/demo/putaway-process3.vue
@@ -117,6 +117,7 @@
     <ren-process-detail></ren-process-detail>
     <el-dialog
       title="审批意见"
+      :close-on-click-modal="false"
       :visible.sync="dialogVisible"
       width="30%"
       :before-close="handleClose"
diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
index b7ce4506..42319aaf 100644
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -65,6 +65,7 @@
     <ren-process-detail></ren-process-detail>
     <el-dialog
       title="审批意见"
+      :close-on-click-modal="false"
       :visible.sync="dialogVisible"
       width="30%"
       :before-close="handleClose"
diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 2461154f..44f56752 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-25 09:42:46
+ * @LastEditTime: 2022-07-28 17:23:05
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -109,6 +109,7 @@
     <ren-process-detail></ren-process-detail>
     <el-dialog
       title="审批意见"
+      :close-on-click-modal="false"
       :visible.sync="dialogVisible"
       width="30%"
       :before-close="handleClose"

From d9139ae621657e1a821d2753cc40ce48b5b4eb7d Mon Sep 17 00:00:00 2001
From: lizhicheng2 <lizhicheng2@hisense.com>
Date: Thu, 28 Jul 2022 17:36:23 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E8=B5=8B=E8=83=BD=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85-=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/home/integrationServicesDetails.vue | 147 ++++++++++++------
 1 file changed, 100 insertions(+), 47 deletions(-)

diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue
index fe18730d..ca2033eb 100644
--- a/front/src/views/home/integrationServicesDetails.vue
+++ b/front/src/views/home/integrationServicesDetails.vue
@@ -23,13 +23,44 @@
       </div>
     </div>
 
-    <!-- 组合能力 -->
+    <!-- 场景痛点 -->
+    <div
+      id="integration-pain-point"
+      class="pain-point scrollBox"
+    >
+      <div class="title-1">
+        <DetalsTitle title="场景痛点" type="PAIN POINT"></DetalsTitle>
+      </div>
+      <div class="flex-row-center">
+        <div class="bg"></div>
+        <div class="content">
+          <div class="content-item" v-for="(item, i) in painPoint" :key="i">{{i+1}}.{{item.description}}</div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 解决方案 -->
+    <div
+      id="integration-solution"
+      class="solution scrollBox"
+    >
+      <div class="title-1">
+        <DetalsTitle title="解决方案" type="SOLUTION"></DetalsTitle>
+      </div>
+      <div class="flex-row-center">
+        <div class="content">
+          <div class="content-item" v-for="(item, i) in solution" :key="i">{{i+1}}.{{item.description}}</div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 使用能力 -->
     <div
       id="integration-combination-ability"
       class="combination-ability scrollBox"
     >
       <div class="title-1">
-        <DetalsTitle title="组合能力" type="COMBINATION ABILITY"></DetalsTitle>
+        <DetalsTitle title="使用能力" type="COMBINATION ABILITY"></DetalsTitle>
       </div>
       <div class="flex-row-center combine-content">
         <div class="combine-item" v-for="(item, i) in combineList" :key="i">
@@ -43,48 +74,23 @@
       </div>
     </div>
 
-    <!-- 使用方式 -->
-    <div id="integration-use-way" class="use-way scrollBox">
+    <!-- 构建步骤 -->
+    <div
+      id="integration-step"
+      class="step scrollBox"
+    >
       <div class="title-1">
-        <DetalsTitle title="使用方式" type="USE WAY"></DetalsTitle>
+        <DetalsTitle title="构建步骤" type="STEP"></DetalsTitle>
       </div>
-      <div class="content">
-        <div class="content-card flex-row-between left word-bg">
-          <div class="content-card-item left-item">
-            <div class="card-title">文档</div>
-            <!-- <div class="card-text">文档描述文档描述文档描述文档描述</div> -->
-          </div>
-          <div class="content-card-item btn-box">
-            <div class="btn" @click="handleOpenUrl('技术文档')">技术文档</div>
-            <div class="btn" @click="handleOpenUrl('使用手册')">使用手册</div>
-          </div>
-        </div>
-        <div class="content-card flex-row-start">
-          <div
-            class="right-item content-card-item"
-            v-for="(use, i) in useWayShowList"
-            :key="i"
-          >
-            <div class="card-title title">{{ use.title }}</div>
-            <div
-              class="card-text"
-              v-for="(d, k) in Object.keys(use.info)"
-              :key="k"
-            >
-              {{ use.info[d] }}:{{ detailInfoObj[d] || '--' }}
-            </div>
-          </div>
+      <div class="flex-row-center">
+        <div style="height: 300px;">
+          <el-steps direction="vertical" :active="step.length">
+            <el-step v-for="(item, i) in step" :key="i" :title="item.question" :description="item.answer"></el-step>
+          </el-steps>
         </div>
       </div>
     </div>
 
-    <!-- 常见问题-->
-    <application-common-problem
-      :dataList="detailInfoObj"
-      id="common-problem"
-      class="scrollBox"
-    ></application-common-problem>
-
     <home-footer></home-footer>
   </div>
 </template>
@@ -102,6 +108,9 @@
   const router = useRouter()
   const scrollTop = ref(0)
   const domArr = ref([])
+  const painPoint = ref([])
+  const solution = ref([])
+  const step=ref([])
   const id = router.currentRoute.value.query.id
   document.documentElement.style.transition = 'all 0.3s ease'
   document.documentElement.scrollTop = 0
@@ -117,20 +126,24 @@
 
   const navList = ref([
     {
-      name: '组合能力',
+      name: '场景痛点',
+      key: 'integration-pain-point',
+    },
+    {
+      name: '解决方案',
+      key: 'integration-solution',
+    },
+    {
+      name: '使用能力',
       key: 'integration-combination-ability',
     },
     {
-      name: '使用方式',
-      key: 'integration-use-way',
-    },
-    {
-      name: '常见问题',
-      key: 'common-problem',
+      name: '构建步骤',
+      key: 'integration-step',
     },
   ])
 
-  const selectNow = ref('integration-combination-ability')
+  const selectNow = ref('integration-pain-point')
 
   const useWayShowList = ref([
     {
@@ -214,9 +227,12 @@
           attrType: '常见问题',
           attrValue: questionValue.attrValue || '[]',
         }
+        painPoint.value = JSON.parse(fuseAttrList.find((v) => v.attrType === '场景痛点').attrValue) || []
+        solution.value = JSON.parse(fuseAttrList.find((v) => v.attrType === '解决方案').attrValue) || []
+        step.value = JSON.parse(fuseAttrList.find((v) => v.attrType === '使用步骤').attrValue) || []
         let areaObj = {
           attrType: '应用领域',
-          attrValue: detailInfoObj.value.applicationArea,
+          attrValue: fuseAttrList.find((v) => v.attrType === '应用领域').attrValue,
         }
         combineList.value.map((item) => {
           let arr = (
@@ -409,6 +425,43 @@
     }
   }
 
+  .pain-point {
+    padding: 0.8rem 0;
+    background: rgb(247, 248, 250);
+    .bg {
+        height: 2rem;
+        width: 2rem;
+        background: url('~@/assets/home/rhfw_square.png') no-repeat;
+        background-size: 100%;
+        margin-top: 0.3rem;
+    }
+    .content {
+        height: 2rem;
+        width: 6rem;
+        .content-item {
+          margin: 0.1rem;
+        }
+    }
+  }
+
+  .solution {
+    padding: 0.8rem 0;
+    background: rgb(247, 248, 250);
+    .content {
+        height: 2rem;
+        width: 8rem;
+        .content-item {
+          margin: 0.3rem;
+        }
+    }
+  }
+
+  .step {
+    padding: 0.8rem 0;
+    background: rgb(247, 248, 250);
+
+  }
+
   .combination-ability {
     padding: 0.8rem 0;
     background: rgb(247, 248, 250);

From 816d07495ceb1acda6cb1baa595b7330cecdc592 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Thu, 28 Jul 2022 17:52:31 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/router/index.js                     |    9 +
 .../home/components/searchResultList.vue      | 1784 ++++++++---------
 front/src/views/home/integrationServices.vue  |  615 +++---
 front/src/views/home/packagingDetails.vue     |  153 ++
 4 files changed, 1329 insertions(+), 1232 deletions(-)
 create mode 100644 front/src/views/home/packagingDetails.vue

diff --git a/front/src/router/index.js b/front/src/router/index.js
index 8a34d071..729ba193 100644
--- a/front/src/router/index.js
+++ b/front/src/router/index.js
@@ -453,6 +453,15 @@ export const constantRoutes = [
       icon: 'error-warning-line',
     },
   },
+  {
+    path: '/packagingDetails',
+    name: 'packagingDetails',
+    component: () => import('@/views/home/packagingDetails'),
+    meta: {
+      title: '打包模式详情',
+      icon: 'error-warning-line',
+    },
+  },
   {
     path: '/integrationServices',
     name: 'integrationServices',
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index e7510cd5..531885ad 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -6,153 +6,101 @@
         检测结果:
         <span>{{ resourceTotal || '' }}</span>
         个{{
-          cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
+            cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
         }}
       </div>
       <div class="condition" :key="showKey">
         <ul v-if="selectCardsname === '融合服务'">
-          <li
-            v-for="(item, i) in orderList"
-            :key="item.value"
-            @click="changeOrder(i, item.value, item.orderType)"
-          >
+          <li v-for="(item, i) in orderList" :key="item.value" @click="changeOrder(i, item.value, item.orderType)">
             {{ item.name }}
-            <span
-              class="arrow"
-              :class="item.orderType == 'ASC' ? 'down' : ''"
-            ></span>
+            <span class="arrow" :class="item.orderType == 'ASC' ? 'down' : ''"></span>
           </li>
         </ul>
         <ul v-else>
-          <li
-            v-for="item in selList"
-            :key="item.value"
-            @click="changeCondition(item.value)"
-            v-show="
-              item.show &&
-              item.name !== '评分' &&
-              selectCardsname !== '数据资源'
-            "
-          >
+          <li v-for="item in selList" :key="item.value" @click="changeCondition(item.value)" v-show="
+            item.show &&
+            item.name !== '评分' &&
+            selectCardsname !== '数据资源'
+          ">
             {{ item.name }}
-            <span
-              class="arrow"
-              :class="item.value == selData ? 'down' : ''"
-            ></span>
+            <span class="arrow" :class="item.value == selData ? 'down' : ''"></span>
           </li>
         </ul>
       </div>
     </div>
-    <div
-      class="result-list"
-      v-for="(item, index) in resourceList.data"
-      :key="item.index"
-    >
+    <div class="result-list" v-for="(item, index) in resourceList.data" :key="item.index">
       <div class="item" :key="showKey">
-        <div
-          class="left"
-          style="display: flex; align-items: center"
-          v-if="
-            item.type === '应用资源' &&
-            item.infoList &&
+        <div class="left" style="display: flex; align-items: center" v-if="
+          item.type === '应用资源' &&
+          item.infoList &&
+          item.infoList.filter((val) => val.attrType == '应用图片')[0]
+        ">
+          <a-image :width="106" :preview="false" :src="
             item.infoList.filter((val) => val.attrType == '应用图片')[0]
-          "
-        >
-          <a-image
-            :width="106"
-            :preview="false"
-            :src="
-              item.infoList.filter((val) => val.attrType == '应用图片')[0]
-                .attrValue
-            "
-          />
+              .attrValue
+          " />
         </div>
-        <div class="left"
-          style="display: flex;
+        <div class="left" style="display: flex;
           align-items: center"
           v-else-if="selectCardsname === '融合服务' && item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]">
-            <a-image
-              :width="106"
-              :preview="false"
-              :src="item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0].attrValue"
-            />
+          <a-image :width="106" :preview="false"
+            :src="item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0].attrValue" />
         </div>
-        <div
-          class="left"
-          :class="
-            item.type == '应用资源'
-              ? 'yyzy'
-              : !item.type
+        <div class="left" :class="
+          item.type == '应用资源'
+            ? 'yyzy'
+            : !item.type
               ? 'sjzy'
               : !item.infoList ||
                 !item.infoList.filter((val) => val.attrType == '组件类型')[0]
-              ? 'znsf'
-              : item.infoList &&
-                item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                  .attrValue == '智能算法'
-              ? 'znsf'
-              : item.infoList &&
-                item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                  .attrValue == '图层服务'
-              ? 'tcfw'
-              : item.infoList &&
-                item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                  .attrValue == '开发组件'
-              ? 'kfzj'
-              : item.infoList &&
-                item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                  .attrValue == '业务组件'
-              ? 'ywzj'
-              : ''
-          "
-          v-else-if="
-            selectCardsname !== '基础设施' && selectCardsname !== '融合服务'
-          "
-        ></div>
+                ? 'znsf'
+                : item.infoList &&
+                  item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                    .attrValue == '智能算法'
+                  ? 'znsf'
+                  : item.infoList &&
+                    item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                      .attrValue == '图层服务'
+                    ? 'tcfw'
+                    : item.infoList &&
+                      item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                        .attrValue == '开发组件'
+                      ? 'kfzj'
+                      : item.infoList &&
+                        item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                          .attrValue == '业务组件'
+                        ? 'ywzj'
+                        : ''
+        " v-else-if="
+  selectCardsname !== '基础设施' && selectCardsname !== '融合服务'
+"></div>
         <div class="left jcss" v-else-if="selectCardsname === '基础设施'"></div>
         <div class="left rhfw" v-else-if="selectCardsname === '融合服务'"></div>
         <div class="right">
           <div class="header">
             <span style="display: flex; align-items: center; width: 680px">
               {{ item.name }}
-              <svg
-                t="1652322568870"
-                class="icon"
-                viewBox="0 0 3072 1024"
-                version="1.1"
-                xmlns="http://www.w3.org/2000/svg"
-                p-id="3062"
-                width="40"
-                height="40"
-                v-if="item.applyState == '通过'"
-                style="margin-left: 10px"
-              >
+              <svg t="1652322568870" class="icon" viewBox="0 0 3072 1024" version="1.1"
+                xmlns="http://www.w3.org/2000/svg" p-id="3062" width="40" height="40" v-if="item.applyState == '通过'"
+                style="margin-left: 10px">
                 <path
                   d="M2958.222222 0a113.777778 113.777778 0 0 1 113.777778 113.777778v796.444444a113.777778 113.777778 0 0 1-113.777778 113.777778H500.053333a113.777778 113.777778 0 0 1-85.617777-38.798222L32.824889 549.432889a56.888889 56.888889 0 0 1 0-74.922667L414.435556 38.798222A113.777778 113.777778 0 0 1 499.996444 0H2958.222222z m0 56.888889H500.053333a56.888889 56.888889 0 0 0-42.837333 19.399111L75.605333 512l381.610667 435.712a56.888889 56.888889 0 0 0 42.780444 19.399111H2958.222222a56.888889 56.888889 0 0 0 56.888889-56.888889V113.777778a56.888889 56.888889 0 0 0-56.888889-56.888889z"
-                  fill="#d81e06"
-                  p-id="3063"
-                ></path>
+                  fill="#d81e06" p-id="3063"></path>
                 <path
                   d="M398.222222 398.222222a113.777778 113.777778 0 1 1 0 227.555556 113.777778 113.777778 0 0 1 0-227.555556z m0 56.888889a56.888889 56.888889 0 1 0 0 113.777778 56.888889 56.888889 0 0 0 0-113.777778z"
-                  fill="#d81e06"
-                  p-id="3064"
-                ></path>
+                  fill="#d81e06" p-id="3064"></path>
                 <path
                   d="M1309.582222 491.064889v-273.066667h-505.173333v47.786667h455.338667v178.176h-378.88V342.926222h-49.152v358.4c0 55.978667 27.306667 84.650667 82.602666 84.650667h370.005334c28.672-1.365333 51.2-8.874667 66.218666-23.210667 16.384-17.749333 27.989333-68.266667 34.816-152.917333l-47.786666-15.018667-1.706667 26.737778c-4.664889 58.766222-12.970667 93.582222-24.917333 104.334222-10.24 8.192-23.893333 12.288-40.277334 12.288h-342.698666c-31.402667 0-47.104-15.701333-47.104-45.738666v-201.386667h428.714666z m430.08-307.2v102.4h-219.136v386.389333h48.469334v-46.421333h170.666666v178.858667h50.517334v-178.858667h167.936v41.642667h48.469333V286.264889h-216.405333v-102.4h-50.517334z m-170.666666 395.946667v-102.4h170.666666v102.4h-170.666666z m221.184 0v-102.4h167.936v102.4h-167.936z m-221.184-146.773334V332.003556h170.666666v101.034666h-170.666666z m221.184 0V332.003556h167.936v101.034666h-167.936z m733.866666-251.221333v44.373333h-165.205333v40.277334h165.205333v45.738666h-137.898666v39.594667h137.898666V398.222222h-184.32v40.96h417.792V398.222222h-186.368v-46.421333h144.725334v-39.594667h-144.725334v-45.738666h169.301334v-40.277334h-169.301334v-44.373333h-47.104z m-85.333333 429.397333h220.501333v49.834667h-220.501333v-49.834667z m220.501333-38.229333h-220.501333v-50.517333h220.501333v50.517333z m-220.501333 126.293333h220.501333v38.912c0 15.701333-8.874667 23.893333-25.258666 23.893334l-54.613334-2.048 11.605334 43.690666h57.344c38.229333 0 58.026667-18.432 58.026666-55.296v-266.24H2391.608889V807.822222h47.104v-108.544z m-222.549333-509.952l-34.816 33.450667c49.152 36.864 88.064 71.68 116.736 104.448l33.450666-34.133333a795.079111 795.079111 0 0 0-115.370666-103.765334z m-82.602667 201.386667h144.725333v299.690667c20.48-19.114667 41.642667-40.277333 64.853334-64.170667l12.970666 51.882667a923.932444 923.932444 0 0 1-121.514666 105.813333l-19.114667-43.690667c10.24-9.557333 15.701333-19.797333 15.701333-31.402666V437.816889h-97.621333v-47.104z"
-                  fill="#d81e06"
-                  p-id="3065"
-                ></path>
+                  fill="#d81e06" p-id="3065"></path>
               </svg>
             </span>
             <div class="header-right">
-              <div v-if="selectCardsname === '融合服务'"
-                class="label-content">
-                <template v-if="item.fuseAttrList && item.fuseAttrList.filter((val)=>val.attrType=='应用领域')[0]">
+              <div v-if="selectCardsname === '融合服务'" class="label-content">
+                <template v-if="item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '应用领域')[0]">
                   <span class="label"
-                    v-for="(data, index) in item.fuseAttrList.filter((val)=>val.attrType=='应用领域')[0].attrValue.split(';')"
-                    :key="index"
-                  >
-                    {{data}}
+                    v-for="(data, index) in item.fuseAttrList.filter((val) => val.attrType == '应用领域')[0].attrValue.split(';')"
+                    :key="index">
+                    {{ data }}
                   </span>
                 </template>
               </div>
@@ -183,19 +131,13 @@
             >
               <span>{{ item.shareType || '--' }}</span>
             </div> -->
-            <div
-              v-if="
-                selectCardsname !== '融合服务' && selectCardsname !== '基础设施'
-              "
-            >
+            <div v-if="
+              selectCardsname !== '融合服务' && selectCardsname !== '基础设施'
+            ">
               <span>{{ item.deptName || '--' }}</span>
             </div>
           </div>
-          <div
-            v-if="selectCardsname !== '基础设施'"
-            style="margin-top: 0.1rem"
-            class="description"
-          >
+          <div v-if="selectCardsname !== '基础设施'" style="margin-top: 0.1rem" class="description">
             <a-tooltip>
               <template #title>{{ item.description }}</template>
               {{ item.description || '--' }}
@@ -204,29 +146,23 @@
           <div class="btn">
             <div class="bottom" v-if="selectCardsname !== '基础设施'">
               <div>
-                <div
-                  v-if="
-                    selectCardsname !== '数据资源' &&
-                    selectCardsname !== '融合服务'
-                  "
-                >
+                <div v-if="
+                  selectCardsname !== '数据资源' &&
+                  selectCardsname !== '融合服务'
+                ">
                   浏览量：{{ item.visits || 0 }}次
                 </div>
-                <div
-                  v-if="
-                    selectCardsname !== '数据资源' &&
-                    selectCardsname !== '融合服务' &&
-                    (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
-                  "
-                >
+                <div v-if="
+                  selectCardsname !== '数据资源' &&
+                  selectCardsname !== '融合服务' &&
+                  (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
+                ">
                   申请量：{{ item.applyCount || 0 }}次
                 </div>
-                <div
-                  v-if="
-                    selectCardsname === '数据资源' &&
-                    selectCardsname !== '融合服务'
-                  "
-                >
+                <div v-if="
+                  selectCardsname === '数据资源' &&
+                  selectCardsname !== '融合服务'
+                ">
                   数据量：{{ item.sjlCount || 0 }}
                 </div>
                 <div v-if="selectCardsname !== '数据资源'">
@@ -245,56 +181,28 @@
             </div>
             <div class="right" v-if="selectCardsname !== '基础设施'">
               <div class="shopping" :key="shoppingKey">
-                <template
-                  v-if="
-                    selectCardsname == '组件服务' ||
-                    (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
-                  "
-                >
-                  <span
-                    class="shopping-down"
-                    v-if="item.isInShoppingCart"
-                  ></span>
-                  <span
-                    class="shopping-on"
-                    v-else
-                    @click="addShoppingCart(item, index)"
-                  ></span>
+                <template v-if="
+                  selectCardsname == '组件服务' ||
+                  (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
+                ">
+                  <span class="shopping-down" v-if="item.isInShoppingCart"></span>
+                  <span class="shopping-on" v-else @click="addShoppingCart(item, index)"></span>
                 </template>
               </div>
               <div class="sc">
-                <span
-                  class="sc-down"
-                  v-if="item.isCollect == 'false'"
-                  @click="addCollect(item)"
-                ></span>
-                <span
-                  class="sc-on"
-                  v-if="item.isCollect == 'true'"
-                  @click="addCollect(item)"
-                ></span>
+                <span class="sc-down" v-if="item.isCollect == 'false'" @click="addCollect(item)"></span>
+                <span class="sc-on" v-if="item.isCollect == 'true'" @click="addCollect(item)"></span>
               </div>
-              <div
-                class="shopping pk"
-                :key="pk"
-                v-show="
-                  cardType == '组件服务' && findComponentName(item, '智能算法')
-                "
-              >
+              <div class="shopping pk" :key="pk" v-show="
+                cardType == '组件服务' && findComponentName(item, '智能算法')
+              ">
                 <span class="pk-on" @click="goComparePk(item, index)"></span>
               </div>
-              <a-button
-                type="primary"
-                @click="toView('details', item)"
-                v-if="!whoShow1.itShowBaoTou"
-              >
+              <a-button type="primary" @click="toView('details', item)" v-if="!whoShow1.itShowBaoTou">
                 查看详情
               </a-button>
-              <a-button
-                style="margin-left: 10px"
-                v-show="selectCardsname === '融合服务'"
-                @click="handleAKeyApplication(item)"
-              >
+              <a-button style="margin-left: 10px" v-show="selectCardsname === '融合服务'"
+                @click="handleAKeyApplication(item)">
                 一键申请
               </a-button>
               <!-- <a-button
@@ -305,16 +213,12 @@
               >
                 免费试用
               </a-button> -->
-              <a-button
-                type="primary"
-                @click="toView('apply', item)"
-                v-show="
-                  cardType == '组件服务' ||
-                  (cardType == '应用资源' && whoShow1.itShowQingDao)
-                "
-              >
+              <a-button type="primary" @click="toView('apply', item)" v-show="
+                cardType == '组件服务' ||
+                (cardType == '应用资源' && whoShow1.itShowQingDao)
+              ">
                 {{
-                  item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
+                    item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                 }}
               </a-button>
             </div>
@@ -327,12 +231,7 @@
         </div>
       </div>
     </div>
-    <a-modal
-      v-model:visible="visible"
-      title="视频预览"
-      :width="750"
-      destroyOnClose
-    >
+    <a-modal v-model:visible="visible" title="视频预览" :width="750" destroyOnClose>
       <template #footer></template>
       <div style="width: 100%; display: flex; justify-content: center">
         <div style="width: 100%; height: 100%">
@@ -343,347 +242,355 @@
   </div>
 </template>
 <script>
-  import { ref, reactive } from 'vue'
-  import { message } from 'ant-design-vue'
-  import { useRouter } from 'vue-router'
-  import { getUser, sgcInsert } from '@/api/home'
-  import { scInsert, scDel } from '@/api/personalCenter'
-  import mybus from '@/myplugins/mybus'
-  import { getHls } from '@/api/home.js'
-  export default {
-    name: '',
-    // props: ['resourceList', 'resourceTotal', 'selectCardsname'],
-    props: {
-      resourceList: {
-        type: Object,
-        default: () => {},
-      },
-      resourceTotal: {
-        type: String,
-        default: '0',
-      },
-      selectCardsname: {
-        type: String,
-        default: '组件服务',
-      },
+import { ref, reactive } from 'vue'
+import { message } from 'ant-design-vue'
+import { useRouter } from 'vue-router'
+import { getUser, sgcInsert } from '@/api/home'
+import { scInsert, scDel } from '@/api/personalCenter'
+import mybus from '@/myplugins/mybus'
+import { getHls } from '@/api/home.js'
+export default {
+  name: '',
+  // props: ['resourceList', 'resourceTotal', 'selectCardsname'],
+  props: {
+    resourceList: {
+      type: Object,
+      default: () => { },
     },
-    computed: {
-      dataList() {
-        const newArr = []
-        for (let i = 0; i < this.resourceList.data.length; i++) {
-          let arr = [
-            {
-              name: '应用名称',
-              value: '',
-            },
-            {
-              name: '应用ID',
-              value: '',
-              dataResourceId: '',
-            },
-            {
-              name: '应用领域',
-              value: '',
-            },
-            {
-              name: '组件类型',
-              value: '',
-            },
-            {
-              name: '技术领域',
-              value: '',
-            },
-            {
-              name: '共享类型',
-              value: '',
-            },
-            {
-              name: '共享条件',
-              value: '',
-            },
-          ]
-          arr.map((item) => {
-            if (item.name === '应用名称') {
-              item.value = this.resourceList.data[i].name
-            }
-            if (item.name === '应用ID') {
-              item.value = this.resourceList.data[i].id
-              item.dataResourceId =
-                this.resourceList.data[i].infoList[0].dataResourceId
-            }
-            if (item.name === '应用领域') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '应用领域' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '组件类型') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '组件类型' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '技术领域') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '技术领域' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '共享类型') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '共享类型' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '共享条件') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '共享条件' ? (item.value = aa.attrValue) : ''
-              })
-            }
-          })
-          newArr.push(arr)
-        }
-        console.log(
-          'dataList======================>',
-          newArr,
-          this.resourceList
-        )
-        return newArr
-      },
-      isShoppingCartOrNot() {
-        return ''
-      },
+    resourceTotal: {
+      type: String,
+      default: '0',
     },
-    components: {},
-    setup(props) {
-      // eslint-disable-next-line no-undef
-      const whoShow1 = whoShow
-      const showKey = ref(0)
-      let shoppingKey = ref(1)
-      // 融合服务排序
-      const orderList = ref([
-        {
-          value: 'collectCount',
-          name: '收藏量',
-          orderType: 'DESC',
-        },
-        {
-          value: 'create_date',
-          name: '发布时间',
-          orderType: 'DESC',
-        },
-        {
-          value: 'update_date',
-          name: '更新时间',
-          orderType: 'DESC',
-        },
-      ])
-      // 购物车id列表
-      const selList = ref([
-        { name: '发布时间', value: 'tdr.create_date', show: true },
-        { name: '浏览量', value: 'visits', show: true },
-        { name: '申请量', value: 'applyCount', show: true },
-        { name: '收藏量', value: 'collectCount', show: true },
-        { name: '评分', value: 'score', show: true },
-      ])
-      if (props.selectCardsname === '基础设施') {
-        selList.value.map((val) => (val.show = false))
-      } else if (props.selectCardsname === '数据资源') {
-        selList.value.map(
-          (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
-        )
+    selectCardsname: {
+      type: String,
+      default: '组件服务',
+    },
+  },
+  computed: {
+    dataList() {
+      const newArr = []
+      for (let i = 0; i < this.resourceList.data.length; i++) {
+        let arr = [
+          {
+            name: '应用名称',
+            value: '',
+          },
+          {
+            name: '应用ID',
+            value: '',
+            dataResourceId: '',
+          },
+          {
+            name: '应用领域',
+            value: '',
+          },
+          {
+            name: '组件类型',
+            value: '',
+          },
+          {
+            name: '技术领域',
+            value: '',
+          },
+          {
+            name: '共享类型',
+            value: '',
+          },
+          {
+            name: '共享条件',
+            value: '',
+          },
+        ]
+        arr.map((item) => {
+          if (item.name === '应用名称') {
+            item.value = this.resourceList.data[i].name
+          }
+          if (item.name === '应用ID') {
+            item.value = this.resourceList.data[i].id
+            item.dataResourceId =
+              this.resourceList.data[i].infoList[0].dataResourceId
+          }
+          if (item.name === '应用领域') {
+            this.resourceList.data[i].infoList.map((aa) => {
+              aa.attrType === '应用领域' ? (item.value = aa.attrValue) : ''
+            })
+          }
+          if (item.name === '组件类型') {
+            this.resourceList.data[i].infoList.map((aa) => {
+              aa.attrType === '组件类型' ? (item.value = aa.attrValue) : ''
+            })
+          }
+          if (item.name === '技术领域') {
+            this.resourceList.data[i].infoList.map((aa) => {
+              aa.attrType === '技术领域' ? (item.value = aa.attrValue) : ''
+            })
+          }
+          if (item.name === '共享类型') {
+            this.resourceList.data[i].infoList.map((aa) => {
+              aa.attrType === '共享类型' ? (item.value = aa.attrValue) : ''
+            })
+          }
+          if (item.name === '共享条件') {
+            this.resourceList.data[i].infoList.map((aa) => {
+              aa.attrType === '共享条件' ? (item.value = aa.attrValue) : ''
+            })
+          }
+        })
+        newArr.push(arr)
       }
-      const findComponentName = (list, name) => {
-        if (list.infoList) {
-          return list.infoList.find((item) => {
-            if (item.attrType === '组件类型') {
-              return item.attrValue === name
-            }
-          })
+      console.log(
+        'dataList======================>',
+        newArr,
+        this.resourceList
+      )
+      return newArr
+    },
+    isShoppingCartOrNot() {
+      return ''
+    },
+  },
+  components: {},
+  setup(props) {
+    // eslint-disable-next-line no-undef
+    const whoShow1 = whoShow
+    const showKey = ref(0)
+    let shoppingKey = ref(1)
+    // 融合服务排序
+    const orderList = ref([
+      {
+        value: 'collectCount',
+        name: '收藏量',
+        orderType: 'DESC',
+      },
+      {
+        value: 'create_date',
+        name: '发布时间',
+        orderType: 'DESC',
+      },
+      {
+        value: 'update_date',
+        name: '更新时间',
+        orderType: 'DESC',
+      },
+    ])
+    // 购物车id列表
+    const selList = ref([
+      { name: '发布时间', value: 'tdr.create_date', show: true },
+      { name: '浏览量', value: 'visits', show: true },
+      { name: '申请量', value: 'applyCount', show: true },
+      { name: '收藏量', value: 'collectCount', show: true },
+      { name: '评分', value: 'score', show: true },
+    ])
+    if (props.selectCardsname === '基础设施') {
+      selList.value.map((val) => (val.show = false))
+    } else if (props.selectCardsname === '数据资源') {
+      selList.value.map(
+        (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
+      )
+    }
+    const findComponentName = (list, name) => {
+      if (list.infoList) {
+        return list.infoList.find((item) => {
+          if (item.attrType === '组件类型') {
+            return item.attrValue === name
+          }
+        })
+      }
+    }
+    console.log('this.resourceList', props.resourceList.data)
+    props.resourceList.data.map((val) => {
+      if (val.infoList) {
+        let obj = val.infoList.filter(
+          (item) => item.attrType == '组件类型'
+        )[0]
+        if (obj) {
+          switch (obj.attrValue) {
+            case '智能算法':
+              val.applicationType = 'znsf'
+              break
+            case '图层服务':
+              val.applicationType = 'tcfw'
+              break
+            case '开发组件':
+              val.applicationType = 'kfzj'
+              break
+            case '业务组件':
+              val.applicationType = 'ywzj'
+              break
+          }
+          console.log('obj', val.applicationType)
         }
       }
-      console.log('this.resourceList', props.resourceList.data)
-      props.resourceList.data.map((val) => {
-        if (val.infoList) {
-          let obj = val.infoList.filter(
-            (item) => item.attrType == '组件类型'
-          )[0]
-          if (obj) {
-            switch (obj.attrValue) {
-              case '智能算法':
-                val.applicationType = 'znsf'
-                break
-              case '图层服务':
-                val.applicationType = 'tcfw'
-                break
-              case '开发组件':
-                val.applicationType = 'kfzj'
-                break
-              case '业务组件':
-                val.applicationType = 'ywzj'
-                break
-            }
-            console.log('obj', val.applicationType)
-          }
+    })
+    showKey.value++
+    const selData = ref('total')
+    const flag = ref(true)
+    // userId
+    const userId = ref('')
+    getUser().then((res) => {
+      console.log('getUser============>', res)
+      userId.value = res.data.data.id
+    })
+    const resultList = [1, 2, 3, 4]
+    const router = useRouter()
+    const cardType = router.currentRoute.value.query.select
+    const onSearch = (searchValue) => {
+      console.log('use value', searchValue)
+      console.log('or use this.value', searchValue.value)
+    }
+    function toView(type, item) {
+      debugger
+      if (props.selectCardsname == '数据资源') {
+        if (whoShow1.itShowQingDao) {
+          window.open(
+            'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
+            item.guid
+          )
+        } else {
+          window.open(
+            'http://10.134.135.24:30090/#/home?id=' + item.serviceId
+          )
         }
-      })
-      showKey.value++
-      const selData = ref('total')
-      const flag = ref(true)
-      // userId
-      const userId = ref('')
-      getUser().then((res) => {
-        console.log('getUser============>', res)
-        userId.value = res.data.data.id
-      })
-      const resultList = [1, 2, 3, 4]
-      const router = useRouter()
-      const cardType = router.currentRoute.value.query.select
-      const onSearch = (searchValue) => {
-        console.log('use value', searchValue)
-        console.log('or use this.value', searchValue.value)
-      }
-      function toView(type, item) {
-        debugger
-        if (props.selectCardsname == '数据资源') {
-          if (whoShow1.itShowQingDao) {
-            window.open(
-              'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
-                item.guid
-            )
-          } else {
-            window.open(
-              'http://10.134.135.24:30090/#/home?id=' + item.serviceId
-            )
-          }
-        } else if (props.selectCardsname === '融合服务') {
+      } else if (props.selectCardsname === '融合服务') {
+        // 打包模式
+        router.push({
+          path: '/packagingDetails',
+          query: {
+            id: item.id,
+          },
+        })
+      } else if (props.selectCardsname === '赋能场景') {
+        router.push({
+          path: '/integrationServicesDetails',
+          query: {
+            id: item.id,
+          },
+        })
+      } else {
+        if (type === 'apply') {
+          console.log('一键申请===================>', item)
+          localStorage.setItem(
+            'applyList',
+            JSON.stringify([
+              {
+                arr: [
+                  {
+                    delFlag: item.delFlag,
+                    description: item.description,
+                    resourceId: item.id,
+                    resourceName: item.name,
+                    time: item.createDate,
+                    type: item.type,
+                    componentType:
+                      (item.infoList.filter(
+                        (val) => val.attrType == '组件类型'
+                      )[0] &&
+                        item.infoList.filter(
+                          (val) => val.attrType == '组件类型'
+                        )[0].attrValue) ||
+                      '',
+                  },
+                ],
+                deptId: item.deptId,
+                deptName: item.deptName,
+              },
+            ])
+          )
           router.push({
-            path: '/integrationServicesDetails',
+            path: '/apply',
+          })
+        } else {
+          console.log(
+            '111111111111111111===========>',
+            router,
+            props.selectCardsname
+          )
+          router.push({
+            path: '/details',
             query: {
               id: item.id,
             },
           })
-        } else {
-          if (type === 'apply') {
-            console.log('一键申请===================>', item)
-            localStorage.setItem(
-              'applyList',
-              JSON.stringify([
-                {
-                  arr: [
-                    {
-                      delFlag: item.delFlag,
-                      description: item.description,
-                      resourceId: item.id,
-                      resourceName: item.name,
-                      time: item.createDate,
-                      type: item.type,
-                      componentType:
-                        (item.infoList.filter(
-                          (val) => val.attrType == '组件类型'
-                        )[0] &&
-                          item.infoList.filter(
-                            (val) => val.attrType == '组件类型'
-                          )[0].attrValue) ||
-                        '',
-                    },
-                  ],
-                  deptId: item.deptId,
-                  deptName: item.deptName,
-                },
-              ])
-            )
-            router.push({
-              path: '/apply',
-            })
-          } else {
-            console.log(
-              '111111111111111111===========>',
-              router,
-              props.selectCardsname
-            )
-            router.push({
-              path: '/details',
-              query: {
-                id: item.id,
-              },
-            })
-          }
         }
       }
-      // 加入申购车
-      const addShoppingCart = (item, index) => {
-        console.log('item===============>', item)
-        if (flag.value && item.id) {
-          flag.value = false
-          sgcInsert({
-            delFlag: '0',
-            resourceId: item.id,
-            // userId: userId.value,
-          }).then((res) => {
-            console.log(res)
-            message.success('添加申购车成功！')
-            mybus.emit('getSgcNum')
-            mybus.emit('changeSelcted', index)
-            flag.value = true
+    }
+    // 加入申购车
+    const addShoppingCart = (item, index) => {
+      console.log('item===============>', item)
+      if (flag.value && item.id) {
+        flag.value = false
+        sgcInsert({
+          delFlag: '0',
+          resourceId: item.id,
+          // userId: userId.value,
+        }).then((res) => {
+          console.log(res)
+          message.success('添加申购车成功！')
+          mybus.emit('getSgcNum')
+          mybus.emit('changeSelcted', index)
+          flag.value = true
+        })
+      }
+      shoppingKey.value++
+      // 查询申购车中已有id,用于过滤图标
+    }
+    // 添加收藏
+    const addCollect = (item) => {
+      console.log('收藏===============>', item, flag.value)
+      if (flag.value && item.id) {
+        flag.value = false
+        if (item.isCollect == 'true') {
+          scDel([item.id]).then((res) => {
+            if (res.data.msg === 'success') {
+              message.success('取消成功')
+              item.isCollect = 'false'
+              item.collectCount--
+              flag.value = true
+              console.log('收藏2===============>', res.data, flag.value)
+            }
+          })
+        } else {
+          scInsert([
+            {
+              resourceId: item.id,
+            },
+          ]).then((res) => {
+            if (res.data.msg === 'success') {
+              message.success('添加收藏成功！')
+              item.isCollect = 'true'
+              item.collectCount++
+              flag.value = true
+              console.log('收藏2===============>', res.data, flag.value)
+            }
           })
         }
-        shoppingKey.value++
-        // 查询申购车中已有id,用于过滤图标
-      }
-      // 添加收藏
-      const addCollect = (item) => {
-        console.log('收藏===============>', item, flag.value)
-        if (flag.value && item.id) {
-          flag.value = false
-          if (item.isCollect == 'true') {
-            scDel([item.id]).then((res) => {
-              if (res.data.msg === 'success') {
-                message.success('取消成功')
-                item.isCollect = 'false'
-                item.collectCount--
-                flag.value = true
-                console.log('收藏2===============>', res.data, flag.value)
-              }
-            })
-          } else {
-            scInsert([
-              {
-                resourceId: item.id,
-              },
-            ]).then((res) => {
-              if (res.data.msg === 'success') {
-                message.success('添加收藏成功！')
-                item.isCollect = 'true'
-                item.collectCount++
-                flag.value = true
-                console.log('收藏2===============>', res.data, flag.value)
-              }
-            })
-          }
-        }
-      }
-      // 更换查询条件
-      const changeCondition = (val) => {
-        selData.value = selData.value == val ? 'total' : val
-        const orderType = selData.value == val ? 'ASC' : 'DESC'
-        mybus.emit('changeCondition', {
-          orderField: val,
-          orderType: orderType,
-        })
-        console.log('选择===========》', val, selData.value)
       }
+    }
+    // 更换查询条件
+    const changeCondition = (val) => {
+      selData.value = selData.value == val ? 'total' : val
+      const orderType = selData.value == val ? 'ASC' : 'DESC'
+      mybus.emit('changeCondition', {
+        orderField: val,
+        orderType: orderType,
+      })
+      console.log('选择===========》', val, selData.value)
+    }
 
-      // 融合服务--排序
-      const changeOrder = (i, val, type) => {
-        let newType = type === 'DESC' ? 'ASC' : 'DESC'
-        orderList.value[i].orderType = newType
-        mybus.emit('changeCondition', {
-          orderField: val,
-          orderType: newType,
-        })
-      }
+    // 融合服务--排序
+    const changeOrder = (i, val, type) => {
+      let newType = type === 'DESC' ? 'ASC' : 'DESC'
+      orderList.value[i].orderType = newType
+      mybus.emit('changeCondition', {
+        orderField: val,
+        orderType: newType,
+      })
+    }
 
-      // 融合服务--一键申请
-      const handleAKeyApplication = (item) => {
-        let _applyList = []
-        ;(item.fuseResourceList || []).map((v) => {
+    // 融合服务--一键申请
+    const handleAKeyApplication = (item) => {
+      let _applyList = []
+        ; (item.fuseResourceList || []).map((v) => {
           let resource = v.resource || {}
           let obj = {
             arr: [
@@ -702,444 +609,497 @@
           _applyList.push(obj)
         })
 
-        localStorage.setItem('applyList', JSON.stringify(_applyList))
-        router.push({
-          path: '/apply',
-        })
-      }
+      localStorage.setItem('applyList', JSON.stringify(_applyList))
+      router.push({
+        path: '/apply',
+      })
+    }
 
-      mybus.on('chongzhi', (typeObj) => {
-        console.log('typeObj------------>', typeObj)
-        if (!typeObj) {
-          selData.value = 'total'
-        }
-        if (typeObj && typeObj.type === '融合服务') {
-          orderList.value = [
-            {
-              value: 'collectCount',
-              name: '收藏量',
-              orderType: 'DESC',
-            },
-            {
-              value: 'create_date',
-              name: '发布时间',
-              orderType: 'DESC',
-            },
-            {
-              value: 'update_date',
-              name: '更新时间',
-              orderType: 'DESC',
-            },
-          ]
-        }
-      })
-      let videoUrl = ref('')
-      const options = reactive({
-        width: '700px', //播放器宽度
-        height: '400px', //播放器高度
-        color: '#409eff', //主题色
-        title: '', //视频名称
-        src: '', //视频源
-        type: 'm3u8', // 视频源类型
-        muted: false, //静音
-        webFullScreen: false,
-        speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
-        autoPlay: true, //自动播放
-        loop: false, //循环播放
-        mirror: false, //镜像画面
-        ligthOff: false, //关灯模式
-        volume: 0.3, //默认音量大小
-        control: true, //是否显示控制
-        controlBtns: [
-          'audioTrack',
-          'quality',
-          'speedRate',
-          'volume',
-          'setting',
-          'pip',
-          'pageFullScreen',
-          'fullScreen',
-        ], //显示所有按钮,
-      })
-      let visible = ref(false)
-      // 打开视频预览
-      const openVideo = (item) => {
-        videoUrl.value = ''
-        const param = {
-          key: item.link,
-        }
-        getHls(param).then((res) => {
-          console.log('获取视频地址===============>', res)
-          // videoUrl.value = res.data.data
-          options.src = res.data.data
-          visible.value = true
-        })
+    mybus.on('chongzhi', (typeObj) => {
+      console.log('typeObj------------>', typeObj)
+      if (!typeObj) {
+        selData.value = 'total'
       }
-      // 算法对比跳转
-      const goComparePk = (item) => {
-        router.push({
-          path: '/algorithmCompare',
-          query: {
-            id: item.id,
+      if (typeObj && typeObj.type === '融合服务') {
+        orderList.value = [
+          {
+            value: 'collectCount',
+            name: '收藏量',
+            orderType: 'DESC',
           },
-        })
+          {
+            value: 'create_date',
+            name: '发布时间',
+            orderType: 'DESC',
+          },
+          {
+            value: 'update_date',
+            name: '更新时间',
+            orderType: 'DESC',
+          },
+        ]
       }
-      return {
-        onSearch,
-        resultList,
-        toView,
-        addShoppingCart,
-        changeCondition,
-        selData,
-        selList,
-        addCollect,
-        cardType,
-        findComponentName,
-        shoppingKey,
-        openVideo,
-        videoUrl,
-        options,
-        visible,
-        goComparePk,
-        whoShow1,
-        showKey,
-        orderList,
-        handleAKeyApplication,
-        changeOrder,
+    })
+    let videoUrl = ref('')
+    const options = reactive({
+      width: '700px', //播放器宽度
+      height: '400px', //播放器高度
+      color: '#409eff', //主题色
+      title: '', //视频名称
+      src: '', //视频源
+      type: 'm3u8', // 视频源类型
+      muted: false, //静音
+      webFullScreen: false,
+      speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
+      autoPlay: true, //自动播放
+      loop: false, //循环播放
+      mirror: false, //镜像画面
+      ligthOff: false, //关灯模式
+      volume: 0.3, //默认音量大小
+      control: true, //是否显示控制
+      controlBtns: [
+        'audioTrack',
+        'quality',
+        'speedRate',
+        'volume',
+        'setting',
+        'pip',
+        'pageFullScreen',
+        'fullScreen',
+      ], //显示所有按钮,
+    })
+    let visible = ref(false)
+    // 打开视频预览
+    const openVideo = (item) => {
+      videoUrl.value = ''
+      const param = {
+        key: item.link,
       }
-    },
-    beforeUnmount() {
-      mybus.off('chongzhi')
-      // mybus.emit('changeSelcted')
-    },
-  }
+      getHls(param).then((res) => {
+        console.log('获取视频地址===============>', res)
+        // videoUrl.value = res.data.data
+        options.src = res.data.data
+        visible.value = true
+      })
+    }
+    // 算法对比跳转
+    const goComparePk = (item) => {
+      router.push({
+        path: '/algorithmCompare',
+        query: {
+          id: item.id,
+        },
+      })
+    }
+    return {
+      onSearch,
+      resultList,
+      toView,
+      addShoppingCart,
+      changeCondition,
+      selData,
+      selList,
+      addCollect,
+      cardType,
+      findComponentName,
+      shoppingKey,
+      openVideo,
+      videoUrl,
+      options,
+      visible,
+      goComparePk,
+      whoShow1,
+      showKey,
+      orderList,
+      handleAKeyApplication,
+      changeOrder,
+    }
+  },
+  beforeUnmount() {
+    mybus.off('chongzhi')
+    // mybus.emit('changeSelcted')
+  },
+}
 </script>
 <style scoped lang="less">
-  #search-result-list-container {
-    width: 1088px;
-    padding: 0 20px;
-    background: #f3f5f9;
-    .detail-content {
-      // 超出
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      width: 130px;
-      display: inline-block;
+#search-result-list-container {
+  width: 1088px;
+  padding: 0 20px;
+  background: #f3f5f9;
+
+  .detail-content {
+    // 超出
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: 130px;
+    display: inline-block;
+  }
+
+  .shai-xuan {
+    width: 1047px;
+    height: 36px;
+    // margin: 11px 0 20px;
+    // background: #e5f2ff;
+    // padding-left: 20px;
+    display: flex;
+    align-items: center;
+    position: relative;
+
+    .circle {
+      width: 16px;
+      height: 16px;
+      border-radius: 50%;
+      background-color: #0087ff;
+      text-align: center;
+      color: #fff;
+      line-height: 16px;
+      margin-right: 21px;
     }
-    .shai-xuan {
-      width: 1047px;
-      height: 36px;
-      // margin: 11px 0 20px;
-      // background: #e5f2ff;
-      // padding-left: 20px;
+
+    .result {
+      font-size: 14px;
+      font-weight: 500;
+      color: #212121;
+
+      span {
+        font-size: 18px;
+        color: #0087ff;
+      }
+    }
+
+    .condition {
+      position: absolute;
+      right: 20px;
+      top: 10px;
+
+      ul li {
+        list-style-type: none;
+      }
+
+      ul {
+        display: flex;
+
+        li {
+          width: 90px;
+          height: 12px;
+          text-align: center;
+          cursor: pointer;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+
+          .arrow {
+            display: inline-block;
+            width: 12px;
+            height: 12px;
+            background: url('~@/assets/newHome/arrow.png');
+            margin-left: 10px;
+          }
+
+          .down {
+            background: url('~@/assets/newHome/down.png');
+            margin-top: 6px;
+          }
+        }
+      }
+    }
+  }
+
+  .result-list {
+    width: 1048px;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
+    border-top: 1px rgba(150, 144, 144, 0.3) solid;
+    padding: 10px 0;
+
+    .item {
+      width: 100%;
+      margin-top: 10px;
       display: flex;
       align-items: center;
-      position: relative;
-      .circle {
-        width: 16px;
-        height: 16px;
-        border-radius: 50%;
-        background-color: #0087ff;
-        text-align: center;
-        color: #fff;
-        line-height: 16px;
-        margin-right: 21px;
+
+      .left {
+        display: inline-block;
+        width: 120px;
+        height: 110px;
+        margin-right: 16px;
       }
-      .result {
-        font-size: 14px;
-        font-weight: 500;
-        color: #212121;
-        span {
-          font-size: 18px;
-          color: #0087ff;
-        }
-      }
-      .condition {
-        position: absolute;
-        right: 20px;
-        top: 10px;
-        ul li {
-          list-style-type: none;
-        }
-        ul {
-          display: flex;
-          li {
-            width: 90px;
-            height: 12px;
-            text-align: center;
-            cursor: pointer;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            .arrow {
-              display: inline-block;
-              width: 12px;
-              height: 12px;
-              background: url('~@/assets/newHome/arrow.png');
-              margin-left: 10px;
-            }
-            .down {
-              background: url('~@/assets/newHome/down.png');
-              margin-top: 6px;
-            }
-          }
-        }
-      }
-    }
-    .result-list {
-      width: 1048px;
-      display: flex;
-      flex-direction: column;
-      flex-wrap: wrap;
-      border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
-      border-top: 1px rgba(150, 144, 144, 0.3) solid;
-      padding: 10px 0;
-      .item {
+
+      .right {
         width: 100%;
-        margin-top: 10px;
+      }
+
+      .yyzy {
+        background: url('~@/assets/home/yyzy_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .sjzy {
+        background: url('~@/assets/home/sjzy_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .znsf {
+        background: url('~@/assets/home/znsf_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .tcfw {
+        background: url('~@/assets/home/tcfw_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .kfzj {
+        background: url('~@/assets/home/kfzj_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .ywzj {
+        background: url('~@/assets/home/ywzj_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .rhfw {
+        background: url('~@/assets/home/rhfw_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .jcss {
+        background: url('~@/assets/home/sxt_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .header {
         display: flex;
+        justify-content: space-between;
         align-items: center;
-        .left {
-          display: inline-block;
-          width: 120px;
-          height: 110px;
-          margin-right: 16px;
-        }
-        .right {
-          width: 100%;
-        }
-        .yyzy {
-          background: url('~@/assets/home/yyzy_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .sjzy {
-          background: url('~@/assets/home/sjzy_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .znsf {
-          background: url('~@/assets/home/znsf_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .tcfw {
-          background: url('~@/assets/home/tcfw_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .kfzj {
-          background: url('~@/assets/home/kfzj_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .ywzj {
-          background: url('~@/assets/home/ywzj_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .rhfw {
-          background: url('~@/assets/home/rhfw_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .jcss {
-          background: url('~@/assets/home/sxt_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .header {
+        margin: 0 10px 0 0;
+
+        .header-right {
           display: flex;
-          justify-content: space-between;
-          align-items: center;
-          margin: 0 10px 0 0;
-          .header-right {
-            display: flex;
+          font-size: 14px;
+          color: #212121;
+
+          span {
             font-size: 14px;
             color: #212121;
-            span {
-              font-size: 14px;
-              color: #212121;
-            }
-            div {
-              margin-right: 24px;
-            }
-            .label-content {
-              flex: 1;
-              display: flex;
-              justify-content: flex-end;
-              .label {
-                padding: 0.01rem 0.1rem;
-                margin-right: 0.1rem;
-                border-radius: 0.13rem;
-                background: #0087ff;
-              }
-            }
           }
-          .header-right:last-child {
-            div {
-              margin-right: 16px;
-            }
-          }
-          span {
-            font-size: 20px;
-            font-weight: 600;
-            // color: #0087ff;
-          }
-        }
-        .dec {
-          overflow: hidden;
-          text-overflow: ellipsis;
-          // white-space: nowrap;
-          color: #0058e1;
-          display: flex;
-          margin-top: 10px;
+
           div {
-            margin-right: 10px;
-            background: rgba(0, 88, 225, 0.1);
-            padding-left: 10px;
-            padding-right: 10px;
+            margin-right: 24px;
           }
-          div:nth-child(2) {
-            max-width: 200px;
-            display: -webkit-box;
-            /*设置为弹性盒子*/
-            -webkit-line-clamp: 1;
-            /*最多显示3行*/
-            overflow: hidden;
-            /*超出隐藏*/
-            text-overflow: ellipsis;
-            /*超出显示为省略号*/
-            -webkit-box-orient: vertical;
-            word-break: break-all;
-          }
-        }
-        .btn {
-          display: flex;
-          justify-content: space-between;
-          font-size: 14px;
-          margin: 5px 0;
-          // .left {
-          //   width: 600px;
-          //   display: flex;
-          //   justify-content: space-between;
-          //   flex-wrap: wrap;
-          //   & > div {
-          //     width: 300px;
-          //     & > span {
-          //       color: #0087ff;
-          //       font-weight: 600;
-          //     }
-          //   }
-          // }
-          .right {
+
+          .label-content {
             flex: 1;
             display: flex;
             justify-content: flex-end;
-            margin: 0 10px;
-            align-items: center;
-            .shopping {
-              span {
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                margin-right: 10px;
-                margin-top: 5px;
-              }
-              .shopping-on {
-                background: url('~@/assets/newHome/shopping-on.png');
-                cursor: pointer;
-              }
-              .shopping-down {
-                background: url('~@/assets/newHome/shopping-down.png');
-              }
+
+            .label {
+              padding: 0.01rem 0.1rem;
+              margin-right: 0.1rem;
+              border-radius: 0.13rem;
+              background: #0087ff;
             }
-            .pk-on {
+          }
+        }
+
+        .header-right:last-child {
+          div {
+            margin-right: 16px;
+          }
+        }
+
+        span {
+          font-size: 20px;
+          font-weight: 600;
+          // color: #0087ff;
+        }
+      }
+
+      .dec {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        // white-space: nowrap;
+        color: #0058e1;
+        display: flex;
+        margin-top: 10px;
+
+        div {
+          margin-right: 10px;
+          background: rgba(0, 88, 225, 0.1);
+          padding-left: 10px;
+          padding-right: 10px;
+        }
+
+        div:nth-child(2) {
+          max-width: 200px;
+          display: -webkit-box;
+          /*设置为弹性盒子*/
+          -webkit-line-clamp: 1;
+          /*最多显示3行*/
+          overflow: hidden;
+          /*超出隐藏*/
+          text-overflow: ellipsis;
+          /*超出显示为省略号*/
+          -webkit-box-orient: vertical;
+          word-break: break-all;
+        }
+      }
+
+      .btn {
+        display: flex;
+        justify-content: space-between;
+        font-size: 14px;
+        margin: 5px 0;
+
+        // .left {
+        //   width: 600px;
+        //   display: flex;
+        //   justify-content: space-between;
+        //   flex-wrap: wrap;
+        //   & > div {
+        //     width: 300px;
+        //     & > span {
+        //       color: #0087ff;
+        //       font-weight: 600;
+        //     }
+        //   }
+        // }
+        .right {
+          flex: 1;
+          display: flex;
+          justify-content: flex-end;
+          margin: 0 10px;
+          align-items: center;
+
+          .shopping {
+            span {
               display: inline-block;
               height: 32px;
               width: 32px;
-              margin-left: 10px;
               margin-right: 10px;
               margin-top: 5px;
-              background: url('~@/assets/newHome/pk-on.png');
+            }
+
+            .shopping-on {
+              background: url('~@/assets/newHome/shopping-on.png');
               cursor: pointer;
             }
-            .sc {
-              // margin-top: 4px;
-              cursor: pointer;
-              display: flex;
-              align-items: center;
-              .sc-down {
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                background: url('~@/assets/newHome/sc-down.png');
-              }
-              .sc-on {
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                background: url('~@/assets/newHome/sc-on.png');
-              }
-            }
-            .ant-btn {
-              background: transparent;
-              background: #0058e1;
-              color: white;
-              width: 80px;
-              height: 32px;
-              font-weight: 600;
-              border-radius: 2px;
-              text-align: center;
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              margin-left: 10px;
-            }
-            .ant-btn:last-child {
-              background: #0058e1;
-              color: white;
+
+            .shopping-down {
+              background: url('~@/assets/newHome/shopping-down.png');
             }
           }
-        }
-        .bottom {
-          display: flex;
-          justify-content: space-between;
-          margin-top: 10px;
-          align-items: center;
-          & > div {
+
+          .pk-on {
+            display: inline-block;
+            height: 32px;
+            width: 32px;
+            margin-left: 10px;
+            margin-right: 10px;
+            margin-top: 5px;
+            background: url('~@/assets/newHome/pk-on.png');
+            cursor: pointer;
+          }
+
+          .sc {
+            // margin-top: 4px;
+            cursor: pointer;
             display: flex;
             align-items: center;
-            & > div {
-              margin: 0 10px;
+
+            .sc-down {
+              display: inline-block;
+              height: 32px;
+              width: 32px;
+              background: url('~@/assets/newHome/sc-down.png');
+            }
+
+            .sc-on {
+              display: inline-block;
+              height: 32px;
+              width: 32px;
+              background: url('~@/assets/newHome/sc-on.png');
             }
           }
-          .pingfen {
-            :deep(span) {
+
+          .ant-btn {
+            background: transparent;
+            background: #0058e1;
+            color: white;
+            width: 80px;
+            height: 32px;
+            font-weight: 600;
+            border-radius: 2px;
+            text-align: center;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-left: 10px;
+          }
+
+          .ant-btn:last-child {
+            background: #0058e1;
+            color: white;
+          }
+        }
+      }
+
+      .bottom {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 10px;
+        align-items: center;
+
+        &>div {
+          display: flex;
+          align-items: center;
+
+          &>div {
+            margin: 0 10px;
+          }
+        }
+
+        .pingfen {
+          :deep(span) {
+            display: flex;
+            align-items: center;
+
+            :deep(ul) {
               display: flex;
               align-items: center;
-              :deep(ul) {
-                display: flex;
-                align-items: center;
-                :deep(.ant-rate-star:not(:last-child)) {
-                  margin-right: 4px;
-                }
+
+              :deep(.ant-rate-star:not(:last-child)) {
+                margin-right: 4px;
               }
             }
           }
         }
       }
-      .item:nth-of-type(1) {
-        margin-top: 0;
-      }
+    }
+
+    .item:nth-of-type(1) {
+      margin-top: 0;
     }
   }
-  .description {
-    max-width: 990px;
-    height: 52px;
-    font-size: 14px;
-    line-height: 18px;
-    display: -webkit-box;
-    -webkit-line-clamp: 3;
-    /*最多显示3行*/
-    overflow: hidden;
-    /*超出隐藏*/
-    text-overflow: ellipsis;
-    /*超出显示为省略号*/
-    -webkit-box-orient: vertical;
-    word-break: break-all;
-  }
+}
+
+.description {
+  max-width: 990px;
+  height: 52px;
+  font-size: 14px;
+  line-height: 18px;
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  /*最多显示3行*/
+  overflow: hidden;
+  /*超出隐藏*/
+  text-overflow: ellipsis;
+  /*超出显示为省略号*/
+  -webkit-box-orient: vertical;
+  word-break: break-all;
+}
 </style>
diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue
index 5712ace6..a1083b41 100644
--- a/front/src/views/home/integrationServices.vue
+++ b/front/src/views/home/integrationServices.vue
@@ -5,56 +5,28 @@
     <div class="top">
       <div class="top-title">
         全部：
-        <div 
-          v-for="(item, index) in titleName" 
-          :key="index" 
-          class="tabAll" 
-          @click="changeCards(index)"
+        <div v-for="(item, index) in titleName" :key="index" class="tabAll" @click="changeCards(index)"
           :class="{ sel: index == number }">
-            <span>{{ item.name }}</span>
+          <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
-            v-model:value="searchValue"
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
+            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
           <button class="button-reset" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
-      <searchResultList
-        v-show="resourceList.data && resourceList.data.length > 0"
-        :key="listKey2"
-        :resourceList="resourceList"
-        :resourceTotal="resourceTotal"
-        selectCardsname="融合服务"
-      />
+      <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :key="listKey2"
+        :resourceList="resourceList" :resourceTotal="resourceTotal" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
       <div class="pagination">
-        <a-pagination
-          v-if="resourceList.data && resourceList.data.length > 0"
-          v-model:current="currentPage"
-          v-model:pageSize="currentPageSize"
-          show-size-changer
-          show-less-items
-          show-quick-jumper
-          :total="resourceTotal"
-          :page-size-options="pageSizeOptions"
-          @change="pageChange"
-          @showSizeChange="onShowSizeChange"
-        />
+        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
+          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
+          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
       </div>
-      <div
-        v-if="resourceList.data && resourceList.data.length <= 0"
-        style="margin-top: 2rem"
-      >
+      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
         <a-empty />
       </div>
     </div>
@@ -62,327 +34,330 @@
   <home-footer></home-footer>
 </template>
 <script>
-  import HomeFooter from '@/views/newHome/components/Footer'
-  import mybus from '@/myplugins/mybus'
-  import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
+import HomeFooter from '@/views/newHome/components/Footer'
+import mybus from '@/myplugins/mybus'
+import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
 
-  import { getIntegrationServicesList } from '@/api/home.js'
-  import { useRouter } from 'vue-router'
-  import HomeHeader from '@/views/home/components/header'
-  import searchResultList from '@/views/home/components/searchResultList.vue'
-  import { message } from 'ant-design-vue'
+import { getIntegrationServicesList } from '@/api/home.js'
+import { useRouter } from 'vue-router'
+import HomeHeader from '@/views/home/components/header'
+import searchResultList from '@/views/home/components/searchResultList.vue'
+import { message } from 'ant-design-vue'
 
-  export default defineComponent({
-    setup() {
+export default defineComponent({
+  setup() {
+    // 分页
+    const loading = ref(true)
+    const currentPage = ref(1)
+    const currentPageSize = ref(5)
+    const pageSizeOptions = ref(['5', '10', '20', '50'])
+    const router = useRouter()
+    const select = router.currentRoute.value.query.select
+    const searchValue = ref('')
+    const Cardsname = ref(select)
+    const resourceList = reactive({ data: [] })
+    const resourceTotal = ref(0)
+    const current = ref(1)
+    // 选项卡
+    const titleName = ref([
+      {
+        name: '打包模式',
+      },
+      {
+        name: '赋能场景',
+      },
+    ])
+
+    const number = ref(0)
+    // 刷新筛选条件组件
+    let listKey = ref(0)
+    // 刷新筛选列表信息组件
+    const listKey2 = ref(0)
+
+    // 查询参数
+    const paramsGetResources = {
+      pageNum: 1,
+      pageSize: currentPageSize.value,
+      type: titleName.value[number.value].name,
+      name: '',
+      orderField: 'create_date', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+      orderType: 'DESC', // ASC 升序  DESC 降序
+    }
+
+    const changeCards = (val) => {
+      console.log(val)
+      number.value = val
+      chongzhi()
+    }
+
+    // 查询
+    const onSearch = () => {
+      loading.value = true
+      currentPage.value = 1
+    }
+    // 重置数据
+    const chongzhi = () => {
+      loading.value = true
+      // 重置模糊查字段
+      searchValue.value = ''
       // 分页
-      const loading = ref(true)
-      const currentPage = ref(1)
-      const currentPageSize = ref(5)
-      const pageSizeOptions = ref(['5', '10', '20', '50'])
-      const router = useRouter()
-      const select = router.currentRoute.value.query.select
-      const searchValue = ref('')
-      const Cardsname = ref(select)
-      const resourceList = reactive({ data: [] })
-      const resourceTotal = ref(0)
-      const current = ref(1)
-      // 选项卡
-      const titleName = ref([
-        {
-          name: '打包模式',
-        },
-        {
-          name: '赋能场景',
-        },
-      ])
-
-      const number = ref(0)
-      // 刷新筛选条件组件
-      let listKey = ref(0)
-      // 刷新筛选列表信息组件
-      const listKey2 = ref(0)
-
-      // 查询参数
-      const paramsGetResources = {
-        pageNum: 1,
-        pageSize: currentPageSize.value,
+      currentPage.value = 1
+      currentPageSize.value = 5
+      // 重置查询条件
+      paramsGetResources.pageNum = 1
+      paramsGetResources.pageSize = 5
+      paramsGetResources.orderField = 'create_date'
+      paramsGetResources.orderType = 'DESC'
+      mybus.emit('chongzhi', {
         type: titleName.value[number.value].name,
-        name: '',
-        orderField: 'create_date', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-        orderType: 'DESC', // ASC 升序  DESC 降序
-      }
+      })
+      getAppResources()
+    }
 
-      const changeCards = (val) => {
-        console.log(val)
-        number.value = val
-        chongzhi()
-      }
+    const getAppResources = () => {
+      getIntegrationList()
+    }
 
-      // 查询
-      const onSearch = () => {
-        loading.value = true
-        currentPage.value = 1
+    // 获取融合服务列表
+    const getIntegrationList = () => {
+      let postData = {
+        limit: currentPageSize.value,
+        page: currentPage.value,
+        orderField: paramsGetResources.orderField,
+        orderType: paramsGetResources.orderType,
+        name: searchValue.value,
+        type: titleName.value[number.value].name,
       }
-      // 重置数据
-      const chongzhi = () => {
-        loading.value = true
-        // 重置模糊查字段
-        searchValue.value = ''
-        // 分页
-        currentPage.value = 1
-        currentPageSize.value = 5
-        // 重置查询条件
-        paramsGetResources.pageNum = 1
-        paramsGetResources.pageSize = 5
-        paramsGetResources.orderField = 'create_date'
-        paramsGetResources.orderType = 'DESC'
-        mybus.emit('chongzhi', {
-          type: titleName.value[number.value].name,
-        })
-        getAppResources()
-      }
-
-      const getAppResources = () => {
-        getIntegrationList()
-      }
-
-      // 获取融合服务列表
-      const getIntegrationList = () => {
-        let postData = {
-          limit: currentPageSize.value,
-          page: currentPage.value,
-          orderField: paramsGetResources.orderField,
-          orderType: paramsGetResources.orderType,
-          name: searchValue.value,
-          type: titleName.value[number.value].name,
-        }
-        getIntegrationServicesList(postData).then(
-          (res) => {
-            if (res.data.code !== 0) {
-              return message.error(res.data.msg)
-            }
-            resourceList.data = res.data.data.list || []
-            resourceTotal.value = res.data.data.total || 0
-          },
-          (err) => {
-            message.error(err)
+      getIntegrationServicesList(postData).then(
+        (res) => {
+          if (res.data.code !== 0) {
+            return message.error(res.data.msg)
           }
-        )
-      }
-
-      mybus.on('paramsGetResources', (ids) => {
-        if (ids && ids.length > 0) {
-          paramsGetResources.deptIds = ids
-        } else {
-          delete paramsGetResources.deptIds
+          resourceList.data = res.data.data.list || []
+          resourceTotal.value = res.data.data.total || 0
+        },
+        (err) => {
+          message.error(err)
         }
-        getAppResources()
-        console.log('paramsGetResources', paramsGetResources)
-      })
-      mybus.on('changePage', (page) => {
-        paramsGetResources.pageNum = page
-        getAppResources('分页查询')
-      })
-      mybus.on('changeSelcted', () => {
-        getAppResources()
-      })
+      )
+    }
 
-      mybus.on('refresh', () => {
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        getAppResources()
-      })
-      mybus.on('changeCondition', (condition) => {
-        paramsGetResources.orderField = condition.orderField
-        paramsGetResources.orderType = condition.orderType
-        getAppResources()
-      })
-
-      const pageChange = (val) => {
-        console.log(val)
-        loading.value = true
-        currentPage.value = val
-        paramsGetResources.pageNum = val
-        let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-        getAppResources(params)
+    mybus.on('paramsGetResources', (ids) => {
+      if (ids && ids.length > 0) {
+        paramsGetResources.deptIds = ids
+      } else {
+        delete paramsGetResources.deptIds
       }
+      getAppResources()
+      console.log('paramsGetResources', paramsGetResources)
+    })
+    mybus.on('changePage', (page) => {
+      paramsGetResources.pageNum = page
+      getAppResources('分页查询')
+    })
+    mybus.on('changeSelcted', () => {
+      getAppResources()
+    })
 
-      onMounted(() => {
-        listKey2.value++
-        getAppResources()
-      })
+    mybus.on('refresh', () => {
+      paramsGetResources.pageNum = 1
+      currentPage.value = 1
+      getAppResources()
+    })
+    mybus.on('changeCondition', (condition) => {
+      paramsGetResources.orderField = condition.orderField
+      paramsGetResources.orderType = condition.orderType
+      getAppResources()
+    })
 
-      // 分页
-      const onShowSizeChange = (current, pageSize) => {
-        currentPage.value = current
-        currentPageSize.value = pageSize
-        paramsGetResources.pageNum = current
-        paramsGetResources.pageSize = pageSize
-        getAppResources()
-      }
-      watch(currentPageSize, () => {
-        console.log('pageSize', currentPageSize.value)
-      })
+    const pageChange = (val) => {
+      console.log(val)
+      loading.value = true
+      currentPage.value = val
+      paramsGetResources.pageNum = val
+      let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+      getAppResources(params)
+    }
 
-      return {
-        listKey,
-        searchValue,
-        currentPage,
-        resourceList,
-        resourceTotal,
-        pageChange,
-        listKey2,
-        Cardsname,
-        getAppResources,
-        chongzhi,
-        onSearch,
-        currentPageSize,
-        pageSizeOptions,
-        current,
-        loading,
-        titleName,
-        changeCards,
-        number,
-      }
-    },
-    components: {
-      HomeHeader,
-      HomeFooter,
-      searchResultList,
-    },
-    beforeUnmount() {
-      mybus.off('paramsGetResources')
-      mybus.off('changeCondition')
-      mybus.off('refresh')
-      mybus.off('changePage')
-    },
-  })
+    onMounted(() => {
+      listKey2.value++
+      getAppResources()
+    })
+
+    // 分页
+    const onShowSizeChange = (current, pageSize) => {
+      currentPage.value = current
+      currentPageSize.value = pageSize
+      paramsGetResources.pageNum = current
+      paramsGetResources.pageSize = pageSize
+      getAppResources()
+    }
+    watch(currentPageSize, () => {
+      console.log('pageSize', currentPageSize.value)
+    })
+
+    return {
+      listKey,
+      searchValue,
+      currentPage,
+      resourceList,
+      resourceTotal,
+      pageChange,
+      listKey2,
+      Cardsname,
+      getAppResources,
+      chongzhi,
+      onSearch,
+      currentPageSize,
+      pageSizeOptions,
+      current,
+      loading,
+      titleName,
+      changeCards,
+      number,
+    }
+  },
+  components: {
+    HomeHeader,
+    HomeFooter,
+    searchResultList,
+  },
+  beforeUnmount() {
+    mybus.off('paramsGetResources')
+    mybus.off('changeCondition')
+    mybus.off('refresh')
+    mybus.off('changePage')
+  },
+})
 </script>
 <style lang="less" scoped>
-  .resultListSearchInput-father {
-    background: #f3f5f9;
-    padding: 0.2rem;
+.resultListSearchInput-father {
+  background: #f3f5f9;
+  padding: 0.2rem;
 
-    // padding-left: 0.2rem;
-    // padding-top: 0.2rem;
-    .resultListSearchInput-son {
-      background: #fff;
-      padding: 0.2rem 0.2rem 0rem 0.3rem;
+  // padding-left: 0.2rem;
+  // padding-top: 0.2rem;
+  .resultListSearchInput-son {
+    background: #fff;
+    padding: 0.2rem 0.2rem 0rem 0.3rem;
 
-      .hengxian {
-        width: 100%;
-        height: 0.01rem;
-        background: rgba(150, 144, 144, 0.3);
-        margin-top: 0.2rem;
-      }
+    .hengxian {
+      width: 100%;
+      height: 0.01rem;
+      background: rgba(150, 144, 144, 0.3);
+      margin-top: 0.2rem;
     }
   }
+}
 
-  .resultListSearchInput {
-    margin-left: 0.1rem;
+.resultListSearchInput {
+  margin-left: 0.1rem;
 
-    :deep(.ant-input) {
-      width: 4rem;
-      height: 0.36rem;
-      background: #fff;
-      border-radius: 0.04rem;
-    }
-
-    :deep(.ant-input-search-button) {
-      width: 0.8rem;
-      height: 0.36rem;
-      background: #0087ff;
-      border-radius: 0.04rem !important;
-      font-size: 0.14rem;
-      font-weight: 400;
-      color: #fff;
-      line-height: 0.34rem;
-      margin-left: 0.1rem;
-    }
-
-    :deep(.ant-input-group-addon) {
-      left: 0 !important;
-    }
+  :deep(.ant-input) {
+    width: 4rem;
+    height: 0.36rem;
+    background: #fff;
+    border-radius: 0.04rem;
   }
 
-  .button-reset {
-    border: 0;
-    outline: none;
+  :deep(.ant-input-search-button) {
     width: 0.8rem;
     height: 0.36rem;
-    background: #e1edfa;
-    border-radius: 0.04rem;
+    background: #0087ff;
+    border-radius: 0.04rem !important;
     font-size: 0.14rem;
     font-weight: 400;
-    color: #0087ff;
+    color: #fff;
     line-height: 0.34rem;
-    margin-left: 2.5rem;
-    cursor: pointer;
+    margin-left: 0.1rem;
   }
 
-  .details-pageconetent {
-    height: 100%;
-    width: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-top: 0.67rem;
+  :deep(.ant-input-group-addon) {
+    left: 0 !important;
+  }
+}
+
+.button-reset {
+  border: 0;
+  outline: none;
+  width: 0.8rem;
+  height: 0.36rem;
+  background: #e1edfa;
+  border-radius: 0.04rem;
+  font-size: 0.14rem;
+  font-weight: 400;
+  color: #0087ff;
+  line-height: 0.34rem;
+  margin-left: 2.5rem;
+  cursor: pointer;
+}
+
+.details-pageconetent {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 0.67rem;
+  position: relative;
+  background: rgba(245, 243, 243, 0.3);
+
+  .details-pageconetent-left {
+    max-height: 6.9rem;
+    position: absolute;
+    width: 2.5rem;
+    top: 0.17rem;
+    left: 2.5rem;
+    margin-right: 0.17rem;
+    overflow: auto;
+  }
+
+  .top {
+    min-height: 7.2rem;
     position: relative;
-    background: rgba(245, 243, 243, 0.3);
+    width: 11.5rem;
+    display: flex;
+    padding-top: 0.2rem;
+    flex-direction: column;
+    font-size: 0.16rem;
+    justify-content: left;
+    background: #f3f5f9;
 
-    .details-pageconetent-left {
-      max-height: 6.9rem;
-      position: absolute;
-      width: 2.5rem;
-      top: 0.17rem;
-      left: 2.5rem;
-      margin-right: 0.17rem;
-      overflow: auto;
-    }
-
-    .top {
-      min-height: 7.2rem;
-      position: relative;
-      width: 11.5rem;
-      display: flex;
-      padding-top: 0.2rem;
-      flex-direction: column;
-      font-size: 0.16rem;
-      justify-content: left;
+    .pagination {
       background: #f3f5f9;
+      padding-bottom: 0.6rem;
+    }
 
-      .pagination {
-        background: #f3f5f9;
-        padding-bottom: 0.6rem;
+    .top-title {
+      padding: 0.2rem;
+      display: flex;
+      font-size: 18px;
+
+      .tabAll {
+        font-size: 18px;
+        color: #000000;
+        margin-right: 35px;
+        cursor: pointer;
       }
 
-      .top-title {
-        padding: 0.2rem;
-        display: flex;
-        font-size: 22px;
-        .tabAll {
-          font-size: 22px;
-          color: #000000;
-          margin-right: 35px;
-          cursor: pointer;
-        }
-        .tabAll:nth-child(1) {
-          margin-left: 20px;
-        }
-        .sel {
-          font-weight: 600;
-          color: #0087ff;
-          border-bottom: 0.02rem solid #0087ff;
-        }
+      .tabAll:nth-child(1) {
+        margin-left: 20px;
+      }
+
+      .sel {
+        font-weight: 600;
+        color: #0087ff;
+        border-bottom: 0.02rem solid #0087ff;
       }
     }
   }
+}
 
-  :deep(.ant-card-grid) {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    -webkit-line-clamp: 1;
-    word-break: break-all;
-  }
+:deep(.ant-card-grid) {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 1;
+  word-break: break-all;
+}
 </style>
diff --git a/front/src/views/home/packagingDetails.vue b/front/src/views/home/packagingDetails.vue
new file mode 100644
index 00000000..da672d45
--- /dev/null
+++ b/front/src/views/home/packagingDetails.vue
@@ -0,0 +1,153 @@
+<template>
+  <!-- 青岛 -->
+  <div class="details-pageconetent">
+    <home-header></home-header>
+    <div></div>
+    <home-footer></home-footer>
+  </div>
+
+</template>
+<script setup>
+import HomeFooter from '@/views/newHome/components/Footer'
+import mybus from '@/myplugins/mybus'
+import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
+
+import { getIntegrationServicesList } from '@/api/home.js'
+import { useRouter } from 'vue-router'
+import HomeHeader from '@/views/home/components/header'
+import searchResultList from '@/views/home/components/searchResultList.vue'
+import { message } from 'ant-design-vue'
+
+
+</script>
+<style lang="less" scoped>
+.resultListSearchInput-father {
+  background: #f3f5f9;
+  padding: 0.2rem;
+
+  // padding-left: 0.2rem;
+  // padding-top: 0.2rem;
+  .resultListSearchInput-son {
+    background: #fff;
+    padding: 0.2rem 0.2rem 0rem 0.3rem;
+
+    .hengxian {
+      width: 100%;
+      height: 0.01rem;
+      background: rgba(150, 144, 144, 0.3);
+      margin-top: 0.2rem;
+    }
+  }
+}
+
+.resultListSearchInput {
+  margin-left: 0.1rem;
+
+  :deep(.ant-input) {
+    width: 4rem;
+    height: 0.36rem;
+    background: #fff;
+    border-radius: 0.04rem;
+  }
+
+  :deep(.ant-input-search-button) {
+    width: 0.8rem;
+    height: 0.36rem;
+    background: #0087ff;
+    border-radius: 0.04rem !important;
+    font-size: 0.14rem;
+    font-weight: 400;
+    color: #fff;
+    line-height: 0.34rem;
+    margin-left: 0.1rem;
+  }
+
+  :deep(.ant-input-group-addon) {
+    left: 0 !important;
+  }
+}
+
+.button-reset {
+  border: 0;
+  outline: none;
+  width: 0.8rem;
+  height: 0.36rem;
+  background: #e1edfa;
+  border-radius: 0.04rem;
+  font-size: 0.14rem;
+  font-weight: 400;
+  color: #0087ff;
+  line-height: 0.34rem;
+  margin-left: 2.5rem;
+  cursor: pointer;
+}
+
+.details-pageconetent {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 0.67rem;
+  position: relative;
+  background: rgba(245, 243, 243, 0.3);
+
+  .details-pageconetent-left {
+    max-height: 6.9rem;
+    position: absolute;
+    width: 2.5rem;
+    top: 0.17rem;
+    left: 2.5rem;
+    margin-right: 0.17rem;
+    overflow: auto;
+  }
+
+  .top {
+    min-height: 7.2rem;
+    position: relative;
+    width: 11.5rem;
+    display: flex;
+    padding-top: 0.2rem;
+    flex-direction: column;
+    font-size: 0.16rem;
+    justify-content: left;
+    background: #f3f5f9;
+
+    .pagination {
+      background: #f3f5f9;
+      padding-bottom: 0.6rem;
+    }
+
+    .top-title {
+      padding: 0.2rem;
+      display: flex;
+      font-size: 18px;
+
+      .tabAll {
+        font-size: 18px;
+        color: #000000;
+        margin-right: 35px;
+        cursor: pointer;
+      }
+
+      .tabAll:nth-child(1) {
+        margin-left: 20px;
+      }
+
+      .sel {
+        font-weight: 600;
+        color: #0087ff;
+        border-bottom: 0.02rem solid #0087ff;
+      }
+    }
+  }
+}
+
+:deep(.ant-card-grid) {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 1;
+  word-break: break-all;
+}
+</style>

From fabd0da877109e8e9fb2a8c65fa0c2291eaee6e1 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 28 Jul 2022 19:35:42 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E6=9B=B4=E6=94=B9=20=E8=A5=BF=E6=B5=B7?=
 =?UTF-8?q?=E5=B2=B8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/infrastructurePage.vue      | 2 +-
 front/src/views/home/videoSurveillance/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 75040aca..837b1700 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -447,7 +447,7 @@
         pageSize: mapSearchParam.value.pageSize,
         name: mapSearchParam.value.cameraName || '',
         longitude: mapSearchParam.value.gpsX || '',
-        atitude: mapSearchParam.value.gpsY || '',
+        latitude: mapSearchParam.value.gpsY || '',
         radius: mapSearchParam.value.radius || '',
       }
       let paramsFather = ''
diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 54b2653d..32097d52 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -224,7 +224,7 @@
             pageSize: this.mapSearchParam.pageSize,
             name: this.mapSearchParam.cameraName || '',
             longitude: this.mapSearchParam.gpsX || '',
-            atitude: this.mapSearchParam.gpsY || '',
+            latitude: this.mapSearchParam.gpsY || '',
             radius: this.mapSearchParam.radius || '',
           }
           let paramsFather = ''

From 1c7bdef115c1e332eff95973d1338d8c94f67754 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 28 Jul 2022 20:12:50 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/putOnTheShelf/components/special.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue
index e6806199..bf515d18 100644
--- a/back/src/views/modules/putOnTheShelf/components/special.vue
+++ b/back/src/views/modules/putOnTheShelf/components/special.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:54:50
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-25 11:20:25
+ * @LastEditTime: 2022-07-28 20:09:53
  * @Description: 多条数据特殊处理
 -->
 <template>
@@ -164,9 +164,10 @@ export default {
     },
     del (title, index) {
       this.data.splice(index, 1)
+      const str = this.data.length > 0 ? JSON.stringify(this.data) : ''
       this.$emit('changeInfoList', {
         attrType: title,
-        attrValue: JSON.stringify(this.data),
+        attrValue: str,
         delFlag: 0
       })
     },

From fb78805786da7111d11e5cd63f9f1923ba9d5645 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 28 Jul 2022 20:20:34 +0800
Subject: [PATCH 07/10] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/ability/bsabilityai.vue      | 4 +++-
 back/src/views/modules/ability/bsabilityservice.vue | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 3ad53de6..40b20ea3 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -607,7 +607,9 @@ export default {
       this.submitFrom.infoList = this.submitFrom.infoList.filter(
         (item) => item.attrType !== obj.attrType
       )
-      this.submitFrom.infoList.push(obj)
+      if (obj.attrValue) {
+        this.submitFrom.infoList.push(obj)
+      }
     },
     changeAdd () {
       const arr = []
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index 382d93b1..ac5976c7 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -581,7 +581,9 @@ export default {
     },
     changeInfoList (obj) {
       this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== obj.attrType)
-      this.submitFrom.infoList.push(obj)
+      if (obj.attrValue) {
+        this.submitFrom.infoList.push(obj)
+      }
     },
     submitData () {
       const arr = []

From bab0c94093dcf1881f3adc4e51119a514d445f00 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 28 Jul 2022 20:37:08 +0800
Subject: [PATCH 08/10] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/ability/bsabilityai.vue      | 6 +++---
 back/src/views/modules/ability/bsabilityservice.vue | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 40b20ea3..9e3833ac 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -607,9 +607,7 @@ export default {
       this.submitFrom.infoList = this.submitFrom.infoList.filter(
         (item) => item.attrType !== obj.attrType
       )
-      if (obj.attrValue) {
-        this.submitFrom.infoList.push(obj)
-      }
+      this.submitFrom.infoList.push(obj)
     },
     changeAdd () {
       const arr = []
@@ -803,6 +801,8 @@ export default {
             }
           )
           this.submitFrom.infoList = newArr
+          // 检验是否有空值
+          this.submitFrom.infoList = this.submitFrom.infoList.filter(item => item.attrValue)
           this.$http
             .put('/resource/update', this.submitFrom)
             .then(({ data: res }) => {
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index ac5976c7..84874bc2 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -581,9 +581,7 @@ export default {
     },
     changeInfoList (obj) {
       this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== obj.attrType)
-      if (obj.attrValue) {
-        this.submitFrom.infoList.push(obj)
-      }
+      this.submitFrom.infoList.push(obj)
     },
     submitData () {
       const arr = []
@@ -711,6 +709,8 @@ export default {
             }
           })
           console.log('编辑===============>', this.submitFrom)
+          // 检验是否有空值
+          this.submitFrom.infoList = this.submitFrom.infoList.filter(item => item.attrValue)
           this.$http
             .put('/resource/update', this.submitFrom)
             .then(({ data: res }) => {

From 8376fb23d51f7454fba5008d52f743f0bfba2747 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Thu, 28 Jul 2022 20:40:48 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=83=BD=E5=8A=9B?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AbnormalSituation.vue          | 315 ++++++++++++++----
 .../components/AnalysisOfTheRequest.vue       | 186 ++++++++---
 .../CapabilityOperationMonitoring/index.vue   |  61 +++-
 back/src/views/modules/workBench/api.js       | 208 ++++++------
 .../workBench/components/lineOption.js        | 243 +++++++-------
 .../workBench/components/trend-view.vue       | 158 +++++----
 front/src/api/capabilityCloud.js              |  11 +-
 .../components/ComponentServices.vue          |   8 +
 8 files changed, 771 insertions(+), 419 deletions(-)

diff --git a/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AbnormalSituation.vue b/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AbnormalSituation.vue
index 3094693b..ff3d8f7f 100644
--- a/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AbnormalSituation.vue
+++ b/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AbnormalSituation.vue
@@ -6,14 +6,14 @@
         <img src="~@/assets/img/CapabilityOperationMonitoring/API-allNum.png" />
         <div>
           <h4>API总数</h4>
-          <p>99999</p>
+          <p>{{ Apisnum }}</p>
         </div>
       </div>
       <div class="ApiBox">
         <img src="~@/assets/img/CapabilityOperationMonitoring/API-badNum.png" />
         <div>
           <h4>异常API总数</h4>
-          <p>99999</p>
+          <p>{{ ApisnumShiBai }}</p>
         </div>
       </div>
     </div>
@@ -24,12 +24,23 @@
         <div class="RankingList">
           <h4 class="title">API异常次数排行TOP10</h4>
           <ul>
-            <li class="RankingListData" v-for="(item, index) in RankingData" :key="index">
-              <i><b>{{ index + 1 }}</b></i>
-              <el-tooltip class="item" effect="dark" :content="item.name" placement="top">
+            <li
+              class="RankingListData"
+              v-for="(item, index) in RankingData"
+              :key="index"
+            >
+              <i
+                ><b>{{ index + 1 }}</b></i
+              >
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="item.name"
+                placement="top"
+              >
                 <h6>{{ item.name }}</h6>
               </el-tooltip>
-              <span>{{ item.num }}</span>
+              <span>{{ item.count }}</span>
             </li>
           </ul>
         </div>
@@ -45,24 +56,62 @@
           <h4 class="title">API异常次数统计</h4>
           <div class="AnomalyStatisticsTable">
             <el-table :data="AnomalyStatisticsTable" border style="width: 100%">
-              <el-table-column prop="name" label="接口名称" width="80" :resizable="false" :show-overflow-tooltip="true">
+              <el-table-column
+                prop="name"
+                label="接口名称"
+                width="80"
+                :resizable="false"
+                :show-overflow-tooltip="true"
+              >
               </el-table-column>
-              <el-table-column prop="address" label="接口地址" width="200" :resizable="false" :show-overflow-tooltip="true">
+              <el-table-column
+                prop="address"
+                label="接口地址"
+                width="200"
+                :resizable="false"
+                :show-overflow-tooltip="true"
+              >
               </el-table-column>
-              <el-table-column prop="method" label="调用方法" :resizable="false" :show-overflow-tooltip="true">
+              <el-table-column
+                prop="method"
+                label="调用方法"
+                :resizable="false"
+                :show-overflow-tooltip="true"
+              >
               </el-table-column>
-              <el-table-column prop="type" label="组件类型" :resizable="false" :show-overflow-tooltip="true">
+              <el-table-column
+                prop="type"
+                label="组件类型"
+                :resizable="false"
+                :show-overflow-tooltip="true"
+              >
               </el-table-column>
-              <el-table-column prop="provider" label="提供商" :resizable="false" :show-overflow-tooltip="true">
+              <el-table-column
+                prop="provider"
+                label="提供商"
+                :resizable="false"
+                :show-overflow-tooltip="true"
+              >
               </el-table-column>
-              <el-table-column prop="state" label="监控状态" :resizable="false" :show-overflow-tooltip="true">
+              <el-table-column
+                prop="state"
+                label="监控状态"
+                :resizable="false"
+                :show-overflow-tooltip="true"
+              >
               </el-table-column>
             </el-table>
           </div>
           <!-- 分页 -->
           <div class="tablePagination">
-            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-              :current-page="currentPage4" :page-size="5" layout="total, prev, pager, next, jumper" :total="total">
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="currentPage4"
+              :page-size="5"
+              layout="total, prev, pager, next, jumper"
+              :total="total"
+            >
             </el-pagination>
           </div>
         </div>
@@ -72,55 +121,26 @@
 </template>
 <script>
 import * as echarts from 'echarts'
-
+import * as moment from 'moment'
 export default {
   // components: {},
-  // props: {},
+  props: {
+    callTheTrendData: {
+      type: Object,
+      default: () => {}
+    },
+    timeSwitchindex: {
+      type: String,
+      default: () => {}
+    }
+  },
   data () {
     return {
+      endAndstartTime: {},
+      ApisnumShiBai: '',
+      Apisnum: '',
       // 排行榜
-      RankingData: [
-        {
-          name: '能力名称一能力名称一能力名称一能力名称一能力名称一',
-          num: '239'
-        },
-        {
-          name: '能力名称二',
-          num: '222'
-        },
-        {
-          name: '能力名称三',
-          num: '123'
-        },
-        {
-          name: '能力名称四',
-          num: '88'
-        },
-        {
-          name: '能力名称五',
-          num: '88'
-        },
-        {
-          name: '能力名称六',
-          num: '88'
-        },
-        {
-          name: '能力名称七',
-          num: '88'
-        },
-        {
-          name: '能力名称八',
-          num: '88'
-        },
-        {
-          name: '能力名称九',
-          num: '88'
-        },
-        {
-          name: '能力名称十',
-          num: '88'
-        }
-      ],
+      RankingData: [],
       // 表格
       AnomalyStatisticsTable: [
         {
@@ -174,6 +194,181 @@ export default {
     // 分页
     this.total = this.AnomalyStatisticsTable.length
   },
+  watch: {
+    callTheTrendData: {
+      deep: true,
+      handler () {
+        this.endAndstartTime = this.callTheTrendData
+        if (this.endAndstartTime.end !== this.endAndstartTime.start) {
+          if (this.timeSwitchindex === '周') {
+            // API总数（周）
+            this.$http
+              .get(
+                `/metrics/api/v1/query?query=sum(increase(apigateway_http_status[7d]))&time=${this.callTheTrendData.end}`
+              )
+              .then((res) => {
+                this.Apisnum = parseInt(res.data.data.result[0].value[1])
+                // API异常总数(周)
+                this.$http
+                  .get(
+                    `/metrics/api/v1/query?query=sum(increase(apigateway_http_status{code=~"^2.."}[7d]))&time=${this.callTheTrendData.end}`
+                  )
+                  .then((resSon) => {
+                    this.ApisnumShiBai = parseInt(
+                      this.Apisnum - resSon.data.data.result[0].value[1]
+                    )
+                  })
+              })
+            // API异常分析(周)
+            this.$http
+              .get(
+                `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[7d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+              )
+              .then((res) => {
+                this.RankingData = res.data.data
+              })
+            // // API异常次数统计(周)
+            // this.$http
+            //   .get(
+            //     `/metrics/api/v1/query?query=topk(10, sum(increase(apigateway_http_status{code != "200"}[7d])) by (matched_uri))&time=${this.callTheTrendData.end}`
+            //   )
+            //   .then((res) => {
+            //     debugger
+            //   })
+          } else if (this.timeSwitchindex === '月') {
+            // API总数（月）
+            this.$http
+              .get(
+                `/metrics/api/v1/query?query=sum(increase(apigateway_http_status[30d]))&time=${this.callTheTrendData.end}`
+              )
+              .then((res) => {
+                this.Apisnum = parseInt(res.data.data.result[0].value[1])
+                // API异常总数(月)
+                this.$http
+                  .get(
+                    `/metrics/api/v1/query?query=sum(increase(apigateway_http_status{code=~"^2.."}[30d]))&time=${this.callTheTrendData.end}`
+                  )
+                  .then((resSon) => {
+                    this.ApisnumShiBai = parseInt(
+                      this.Apisnum - resSon.data.data.result[0].value[1]
+                    )
+                  })
+              })
+            // API异常分析(月)
+            this.$http
+              .get(
+                `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[30d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+              )
+              .then((res) => {
+                this.RankingData = res.data.data
+              })
+          } else if (this.timeSwitchindex === '时间段') {
+            // API总数（时间段）
+            this.$http
+              .get(
+                `/metrics/api/v1/query?query=sum(increase(apigateway_http_status[${
+                  this.callTheTrendData.end - this.callTheTrendData.start
+                }s:1s]))&time=${this.callTheTrendData.end}`
+              )
+              .then((res) => {
+                this.Apisnum = parseInt(res.data.data.result[0].value[1])
+                // API异常总数(时间段)
+                this.$http
+                  .get(
+                    `/metrics/api/v1/query?query=sum(increase(apigateway_http_status{code=~"^2.."}[${
+                      this.callTheTrendData.end - this.callTheTrendData.start
+                    }s:1s]))&time=${this.callTheTrendData.end}`
+                  )
+                  .then((resSon) => {
+                    this.ApisnumShiBai = parseInt(
+                      this.Apisnum - resSon.data.data.result[0].value[1]
+                    )
+                  })
+              })
+            // API异常分析(时间段)
+            this.$http
+              .get(
+                `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[${
+                  this.callTheTrendData.end - this.callTheTrendData.start
+                }s:1s]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${
+                  this.callTheTrendData.end
+                }`
+              )
+              .then((res) => {
+                this.RankingData = res.data.data
+              })
+          }
+        } else {
+          // API总数（日）
+          this.$http
+            .get(
+              `/metrics/api/v1/query?query=sum(increase(apigateway_http_status[1d]))&time=${this.callTheTrendData.end}`
+            )
+            .then((res) => {
+              this.Apisnum = parseInt(res.data.data.result[0].value[1])
+              // API异常总数(日)
+              this.$http
+                .get(
+                  `/metrics/api/v1/query?query=sum(increase(apigateway_http_status{code=~"^2.."}[1d]))&time=${this.callTheTrendData.end}`
+                )
+                .then((resSon) => {
+                  this.ApisnumShiBai = parseInt(
+                    this.Apisnum - resSon.data.data.result[0].value[1]
+                  )
+                })
+            })
+          // API异常分析(日)
+          this.$http
+            .get(
+              `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[1d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+            )
+            .then((res) => {
+              this.RankingData = res.data.data
+            })
+        }
+      }
+    },
+    timeSwitchindex: {
+      handler () {
+        if (this.timeSwitchindex === '时间段') {
+          // API总数（时间段）
+          this.$http
+            .get(
+              `/metrics/api/v1/query?query=sum(increase(apigateway_http_status[${
+                this.callTheTrendData.end - this.callTheTrendData.start
+              }s:1s]))&time=${this.callTheTrendData.end}`
+            )
+            .then((res) => {
+              this.Apisnum = parseInt(res.data.data.result[0].value[1])
+              // API异常总数(时间段)
+              this.$http
+                .get(
+                  `/metrics/api/v1/query?query=sum(increase(apigateway_http_status{code=~"^2.."}[${
+                    this.callTheTrendData.end - this.callTheTrendData.start
+                  }s:1s]))&time=${this.callTheTrendData.end}`
+                )
+                .then((resSon) => {
+                  this.ApisnumShiBai = parseInt(
+                    this.Apisnum - resSon.data.data.result[0].value[1]
+                  )
+                })
+            })
+          // API异常分析(时间段)
+          this.$http
+            .get(
+              `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[${
+                this.callTheTrendData.end - this.callTheTrendData.start
+              }s:1s]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${
+                this.callTheTrendData.end
+              }`
+            )
+            .then((res) => {
+              this.RankingData = res.data.data
+            })
+        }
+      }
+    }
+  },
   methods: {
     // 分页
     handleSizeChange (val) {
@@ -276,7 +471,7 @@ export default {
     }
 
     .ApiBox {
-      background: url("~@/assets/img/CapabilityOperationMonitoring/bg-blue.png")
+      background: url('~@/assets/img/CapabilityOperationMonitoring/bg-blue.png')
         no-repeat;
       background-size: 100%;
       width: 22.5rem;
@@ -314,7 +509,7 @@ export default {
     }
 
     .ApiBox:last-of-type {
-      background: url("~@/assets/img/CapabilityOperationMonitoring/bg-yellow.png")
+      background: url('~@/assets/img/CapabilityOperationMonitoring/bg-yellow.png')
         no-repeat;
       background-size: 100%;
 
diff --git a/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AnalysisOfTheRequest.vue b/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AnalysisOfTheRequest.vue
index 2148c9a4..c10adf45 100644
--- a/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AnalysisOfTheRequest.vue
+++ b/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AnalysisOfTheRequest.vue
@@ -81,7 +81,7 @@
             >
               <div>{{ item.name }}</div>
             </el-tooltip>
-            <div>{{ item.snum }}</div>
+            <div>{{ item.count }}</div>
           </div>
         </div>
       </div>
@@ -98,6 +98,10 @@ export default {
     callTheTrendData: {
       type: Object,
       default: () => {}
+    },
+    timeSwitchindex: {
+      type: String,
+      default: () => {}
     }
   },
   data () {
@@ -151,56 +155,93 @@ export default {
       },
       abilityListTabData: ['请求次数', '请求失败次数', '平均延时'], // 能力排行榜tab切换
       newTab: '请求次数',
-      abilityListData: [
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一222222222222222222222222',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        },
-        {
-          name: '能里名称一',
-          snum: '239'
-        }
-      ] // 能力排行数据初始化
+      abilityListData: [] // 能力排行数据初始化
     }
   },
   watch: {
-    callTheTrendData: {
+    dataRange: {
       deep: true,
       handler () {
         this.endAndstartTime = this.callTheTrendData
         if (this.endAndstartTime.end != this.endAndstartTime.start) {
+          if (this.timeSwitchindex === '周') {
+            if (this.newTab === '请求次数') {
+              // 能力排行榜请求次数(周)
+              this.$http
+                .get(
+                  `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status[7d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+                )
+                .then((res) => {
+                  this.abilityListData = res.data.data
+                  this.abilityListData.forEach((item) => {
+                    item.count = parseInt(item.count)
+                  })
+                })
+            } else if (this.newTab === '请求失败次数') {
+              // 能力排行榜请求失败次数(周)
+              this.$http
+                .get(
+                  `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[7d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+                )
+                .then((res) => {
+                  this.abilityListData = res.data.data
+                })
+            }
+          } else if (this.timeSwitchindex === '月') {
+            if (this.newTab === '请求次数') {
+              // 能力排行榜请求次数(月)
+              this.$http
+                .get(
+                  `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status[30d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+                )
+                .then((res) => {
+                  this.abilityListData = res.data.data
+                  this.abilityListData.forEach((item) => {
+                    item.count = parseInt(item.count)
+                  })
+                })
+            } else if (this.newTab === '请求失败次数') {
+              // 能力排行榜请求失败次数(周)
+              this.$http
+                .get(
+                  `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[30d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+                )
+                .then((res) => {
+                  this.abilityListData = res.data.data
+                })
+            }
+          } else if (this.timeSwitchindex === '时间段') {
+            if (this.newTab === '请求次数') {
+              // 能力排行榜请求次数(时间段)
+              this.$http
+                .get(
+                  `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status[${
+                    this.callTheTrendData.end - this.callTheTrendData.start
+                  }s:1s]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${
+                    this.callTheTrendData.end
+                  }`
+                )
+                .then((res) => {
+                  this.abilityListData = res.data.data
+                  this.abilityListData.forEach((item) => {
+                    item.count = parseInt(item.count)
+                  })
+                })
+            } else if (this.newTab === '请求失败次数') {
+              // 能力排行榜请求失败次数(周)
+              this.$http
+                .get(
+                  `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[${
+                    this.callTheTrendData.end - this.callTheTrendData.start
+                  }s:1s]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${
+                    this.callTheTrendData.end
+                  }`
+                )
+                .then((res) => {
+                  this.abilityListData = res.data.data
+                })
+            }
+          }
           this.$http
             .get(
               '/metrics/api/v1/query?' +
@@ -240,6 +281,29 @@ export default {
               }
             })
         } else {
+          if (this.newTab === '请求次数') {
+            // 能力排行榜请求次数(日)
+            this.$http
+              .get(
+                `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status[1d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+              )
+              .then((res) => {
+                this.abilityListData = res.data.data
+                this.abilityListData.forEach((item) => {
+                  item.count = parseInt(item.count)
+                })
+              })
+          } else if (this.newTab === '请求失败次数') {
+            // 能力排行榜请求失败次数(周)
+            this.$http
+              .get(
+                `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status{code!='200'}[1d]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${this.callTheTrendData.end}`
+              )
+              .then((res) => {
+                this.abilityListData = res.data.data
+              })
+          }
+
           this.$http
             .get(
               '/metrics/api/v1/query?query=sum(apigateway_http_status)&time=' +
@@ -282,7 +346,6 @@ export default {
             )
             .then((res) => {
               if (res.data.data.result[0]) {
-                debugger
                 this.requestOverviewData[3].tatol = parseInt(
                   res.data.data.result[0].value[1]
                 )
@@ -406,7 +469,6 @@ export default {
                 86400
             )
             .then((res) => {
-              debugger
               if (res.data.data.result[0]) {
                 res.data.data.result[0].values.map((item, index) => {
                   this.shuJuLiuLiang.ruvalue.push(
@@ -422,9 +484,39 @@ export default {
         }
         console.log('this.endAndstartTime', this.endAndstartTime)
       }
+    },
+    timeSwitchindex: {
+      handler () {
+        if (this.timeSwitchindex === '时间段' && this.newTab === '请求次数') {
+          // 能力排行榜请求次数(时间段)
+          this.$http
+            .get(
+              `/gateway-monitor/queryGroupByAbility?query=topk(10, sum(label_replace(increase(apigateway_http_status[${
+                this.callTheTrendData.end - this.callTheTrendData.start
+              }s:1s]), "groupInfo", "$2", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (groupInfo))&time=${
+                this.callTheTrendData.end
+              }`
+            )
+            .then((res) => {
+              this.abilityListData = res.data.data
+              this.abilityListData.forEach((item) => {
+                item.count = parseInt(item.count)
+              })
+            })
+        }
+      }
+    }
+  },
+  computed: {
+    dataRange () {
+      const { timeSwitchindex, callTheTrendData, newTab } = this
+      return {
+        timeSwitchindex,
+        callTheTrendData,
+        newTab
+      }
     }
   },
-  computed: {},
   methods: {
     // echarts通用方法
     // 请求趋势图
diff --git a/back/src/views/modules/sys/CapabilityOperationMonitoring/index.vue b/back/src/views/modules/sys/CapabilityOperationMonitoring/index.vue
index 7a1284dd..65b7ed8a 100644
--- a/back/src/views/modules/sys/CapabilityOperationMonitoring/index.vue
+++ b/back/src/views/modules/sys/CapabilityOperationMonitoring/index.vue
@@ -40,16 +40,22 @@
             :picker-options="pickerOptions1"
           >
           </el-date-picker>
-          <el-button type="primary" round>确定</el-button>
+          <el-button type="primary" round @click="switchTimeFunction()"
+            >确定</el-button
+          >
         </div>
       </div>
     </div>
     <div class="capability-operation-monitoring-center">
-      <abnormal-situation></abnormal-situation>
+      <abnormal-situation
+        :callTheTrendData="callTheTrendData"
+        :timeSwitchindex="timeSwitchindex"
+      ></abnormal-situation>
     </div>
     <div class="capability-operation-monitoring-bottom">
       <analysis-of-the-request
         :callTheTrendData="callTheTrendData"
+        :timeSwitchindex="timeSwitchindex"
       ></analysis-of-the-request>
     </div>
   </div>
@@ -67,8 +73,9 @@ export default {
   data () {
     return {
       timeSwitchindex: '日',
-      timeStart: '',
-      timeEnd: '',
+      timeStart: new Date(),
+      leftAndrightTime: 0,
+      timeEnd: new Date(),
       pickerOptions0: {
         disabledDate: (time) => {
           if (this.timeEnd != '') {
@@ -87,29 +94,53 @@ export default {
       }
     }
   },
-  watch: {},
+  watch: {
+    timeSwitchindex: {
+      handler () {
+        var time = new Date()
+        switch (this.timeSwitchindex) {
+          case '日':
+            this.timeStart = time
+            this.timeEnd = time
+            break
+          case '周':
+            this.timeStart = new Date(time.getTime() - 168 * 60 * 60 * 1000)
+            this.timeEnd = time
+            break
+          case '月':
+            this.timeStart = new Date(time.getTime() - 720 * 60 * 60 * 1000)
+            this.timeEnd = time
+        }
+      }
+    },
+    timeStart: {
+      handler () {
+        this.callTheTrendData.start = parseInt(this.timeStart / 1000)
+      }
+    },
+    timeEnd: {
+      handler () {
+        this.callTheTrendData.end = parseInt(this.timeEnd / 1000)
+      }
+    }
+  },
   computed: {},
   methods: {
+    switchTimeFunction () {
+      this.timeSwitchindex = '时间段'
+    },
     timeSwitch (name) {
       this.timeSwitchindex = name
-      if (name == '周') {
+      if (name === '周') {
         const start = parseInt(
           (Date.parse(new Date()) - 168 * 60 * 60 * 1000) / 1000
         )
         this.callTheTrendData.start = start
-        console.log(
-          'this.callTheTrendData',
-          parseInt((Date.parse(new Date()) - 168 * 60 * 60 * 1000) / 1000)
-        )
-      } else if (name == '月') {
+      } else if (name === '月') {
         const start = parseInt(
           (Date.parse(new Date()) - 720 * 60 * 60 * 1000) / 1000
         )
         this.callTheTrendData.start = start
-        console.log(
-          'this.callTheTrendData',
-          parseInt((Date.parse(new Date()) - 720 * 60 * 60 * 1000) / 1000)
-        )
       } else {
         this.callTheTrendData.start = Date.parse(new Date()) / 1000
         this.callTheTrendData.end = Date.parse(new Date()) / 1000
diff --git a/back/src/views/modules/workBench/api.js b/back/src/views/modules/workBench/api.js
index 38aad1e9..e14a4780 100644
--- a/back/src/views/modules/workBench/api.js
+++ b/back/src/views/modules/workBench/api.js
@@ -1,152 +1,148 @@
 // /resource/getByDept
-import http from '@/utils/request';
+import http from '@/utils/request'
 
 function Request({
-    methods, url, data, success, fali
+  methods, url, data, success, fali
 }) {
-    let _key = methods == 'get' ? 'params' : 'data';
-    return new Promise((resolve, reject) => {
-        http[methods](url, {
-            [_key]: data
-        }).then(res => {
-            resolve(res)
-        }, err => {
-            reject(err)
-        })
+  const _key = methods == 'get' ? 'params' : 'data'
+  return new Promise((resolve, reject) => {
+    http[methods](url, {
+      [_key]: data
+    }).then(res => {
+      resolve(res)
+    }, err => {
+      reject(err)
     })
-
+  })
 }
 function RequestPost({
-    methods, url, data, success, fali
+  methods, url, data, success, fali
 }) {
-    return new Promise((resolve, reject) => {
-        http[methods](url, 
-            data
-        ).then(res => {
-            resolve(res)
-        }, err => {
-            reject(err)
-        })
+  return new Promise((resolve, reject) => {
+    http[methods](url,
+      data
+    ).then(res => {
+      resolve(res)
+    }, err => {
+      reject(err)
     })
-
+  })
 }
 
 // /resource/getByDept:获取当前登录用户所在部门发布的资源
 
 // 部门待办列表
 export const getToDoTask = (data, success, fail) => {
-    Request({
-        methods: 'get',
-        url: '/act/task/deptToDoTaskPage',
-        data
-    }).then(res => {
-        success && success(res)
-    }).catch(err => {
-        fail && fail(err)
-    })
+  Request({
+    methods: 'get',
+    url: '/act/task/deptToDoTaskPage',
+    data
+  }).then(res => {
+    success && success(res)
+  }).catch(err => {
+    fail && fail(err)
+  })
 }
 
 // 部门已办列表
 export const getHasToDoTask = (data, success, fail) => {
-    Request({
-        methods: 'get',
-        url: '/act/his/getDeptHandledInstancePage',
-        data
-    }).then(res => {
-        success && success(res)
-    }).catch(err => {
-        fail && fail(err)
-    })
+  Request({
+    methods: 'get',
+    url: '/act/his/getDeptHandledInstancePage',
+    data
+  }).then(res => {
+    success && success(res)
+  }).catch(err => {
+    fail && fail(err)
+  })
 }
 
 // 上架统计《====》饼图
 export const getTotalByDept = (data, success, fail) => {
-    Request({
-        methods: 'get',
-        url: '/resource/selectTotalByDept',
-        data
-    }).then(res => {
-        success && success(res)
-    }).catch(err => {
-        fail && fail(err)
-    })
+  Request({
+    methods: 'get',
+    url: '/resource/selectTotalByDept',
+    data
+  }).then(res => {
+    success && success(res)
+  }).catch(err => {
+    fail && fail(err)
+  })
 }
 
-
 // 部门申请
 export const getApply = (data, success, fail) => {
-    Request({
-        methods: 'get',
-        url: '/resource/selectTotalApplyByDept',
-        data
-    }).then(res => {
-        success && success(res)
-    }).catch(err => {
-        fail && fail(err)
-    })
+  Request({
+    methods: 'get',
+    url: '/resource/selectTotalApplyByDept',
+    data
+  }).then(res => {
+    success && success(res)
+  }).catch(err => {
+    fail && fail(err)
+  })
 }
 
 // 部门需求
 export const getRequire = (data, success, fail) => {
-    Request({
-        methods: 'get',
-        url: '/demanData/selectFlagCountByDepts',
-        data
-    }).then(res => {
-        success && success(res)
-    }).catch(err => {
-        fail && fail(err)
-    })
+  Request({
+    methods: 'get',
+    url: '/demanData/selectFlagCountByDepts',
+    data
+  }).then(res => {
+    success && success(res)
+  }).catch(err => {
+    fail && fail(err)
+  })
 }
 
 // 频率top5
 export const getFrequence = (data, success, fail) => {
-    Request({
-        methods: 'get',
-        url: '/resource/selectDeptResourceByApplyNum', 
-        data
-    }).then(res => {
-        success && success(res)
-    }).catch(err => {
-        fail && fail(err)
-    })
+  Request({
+    methods: 'get',
+    url: '/resource/selectDeptResourceByApplyNum',
+    data
+  }).then(res => {
+    success && success(res)
+  }).catch(err => {
+    fail && fail(err)
+  })
 }
 
 // 部门发布动态
 export const getResourceByDept = (data, success, fail) => {
-    Request({
-        methods: 'get',
-        // url: '/resource/getByDept',
-        url: '/workdynamics/getDeptWork',
-        data
-    }).then(res => {
-        success && success(res)
-    }).catch(err => {
-        fail && fail(err)
-    })
+  Request({
+    methods: 'get',
+    // url: '/resource/getByDept',
+    url: '/workdynamics/getDeptWork',
+    data
+  }).then(res => {
+    success && success(res)
+  }).catch(err => {
+    fail && fail(err)
+  })
 }
 
 // 部门能力推荐
 export const getApplyByDept = (data, success, fail) => {
-    Request({
-        methods: 'get',
-        url: '/resource/getApplyByDept',
-        data
-    }).then(res => {
-        success && success(res)
-    }).catch(err => {
-        fail && fail(err)
-    })
+  Request({
+    methods: 'get',
+    url: '/resource/getApplyByDept',
+    data
+  }).then(res => {
+    success && success(res)
+  }).catch(err => {
+    fail && fail(err)
+  })
 }
 // 部门发布能力被调用趋势
 export const getByDept = (data, success, fail) => {
-    RequestPost({
-        methods: 'post',
-        url: '/resource/trafficDeptResource',
-        data
-    }).then(res => {
-        success && success(res)
-    }).catch(err => {
-        fail && fail(err)
-    })
-}
\ No newline at end of file
+  RequestPost({
+    methods: 'get',
+    url: `/gateway-monitor/queryGroupByDeptInRange?query=sum(label_replace(increase(apigateway_http_status[1d]), "deptInfo", "$1", "matched_uri", "/juapi/(.*?)/(.*?)/.*")) by (deptInfo)&start=${data.startDate}&end=${data.endDate}&step=86400`
+  }).then(res => {
+    success && success(res)
+  }).catch(err => {
+    fail && fail(err)
+  })
+}
diff --git a/back/src/views/modules/workBench/components/lineOption.js b/back/src/views/modules/workBench/components/lineOption.js
index cc9a5142..b4d94fba 100644
--- a/back/src/views/modules/workBench/components/lineOption.js
+++ b/back/src/views/modules/workBench/components/lineOption.js
@@ -1,129 +1,128 @@
 import * as echarts from 'echarts'
-//折线图
+// 折线图
 export const trendLineChart = (id, chartData, _option) => {
+  const { xaxis = [], ydata = [] } = chartData
+  let option = {
+    tooltip: {
+      trigger: 'axis'
+    },
+    grid: {
+      top: '16%',
+      left: '7%',
+      right: '7%',
+      bottom: '10%'
+    },
+    xAxis: [{
+      type: 'category',
+      boundaryGap: true,
+      axisLine: { // 坐标轴轴线相关设置。数学上的x轴
+        show: true,
+        lineStyle: {
+          color: 'rgba(138,178,241)'
+        }
+      },
+      axisLabel: { // 坐标轴刻度标签的相关设置
+        textStyle: {
+          color: '#2b2b2b',
+          margin: 15,
+          fontSize: '14'
+        }
+      },
+      axisTick: {
+        show: false
+      },
+      data: xaxis
+    }],
+    yAxis: [{
+      name: '使用量(万次)',
+      nameTextStyle: { color: '#2b2b2b' },
+      type: 'value',
+      min: 0,
+      max: 100,
+      splitNumber: 5,
+      splitLine: {
+        show: false,
+        lineStyle: {
+          color: 'rgba(255,255,255,0.1)'
+        }
+      },
+      axisLine: {
+        show: true,
+        lineStyle: {
+          color: 'rgba(138,178,241)'
+        }
+      },
+      axisLabel: {
+        show: true,
+        textStyle: {
+          color: '#2b2b2b',
+          margin: 15,
+          fontSize: '14'
+        }
 
-    let { xaxis = [], ydata = [], } = chartData;
-    let option = {
-        tooltip: {
-            trigger: 'axis',
+      },
+      axisTick: {
+        show: false
+      }
+    }],
+    series: [{
+      name: '使用量',
+      type: 'line',
+      showAllSymbol: true,
+      symbolSize: 0,
+      symbol: 'circle',
+      symbolSize: 5, // 设定实心点的大小
+      lineStyle: {
+        normal: {
+
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
+            offset: 0,
+            color: '#0058e1'
+          }, {
+            offset: 1,
+            color: '#0058e1'
+          }])
         },
-        grid: {
-            top: '16%',
-            left: '7%',
-            right: '7%',
-            bottom: '10%',
-        },
-        xAxis: [{
-            type: 'category',
-            boundaryGap: true,
-            axisLine: { //坐标轴轴线相关设置。数学上的x轴
-                show: true,
-                lineStyle: {
-                    color: 'rgba(138,178,241)'
-                },
-            },
-            axisLabel: { //坐标轴刻度标签的相关设置
-                textStyle: {
-                    color: '#2b2b2b',
-                    margin: 15,
-                    fontSize: '14'
-                },
-            },
-            axisTick: {
-                show: false,
-            },
-            data: xaxis,
-        }],
-        yAxis: [{
-            name: '使用量(万次)',
-            nameTextStyle:{color:"#2b2b2b"},
-            type: 'value',
-            min: 0,
-            max: 100,
-            splitNumber: 5,
-            splitLine: {
-                show: false,
-                lineStyle: {
-                    color: 'rgba(255,255,255,0.1)'
-                }
-            },
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: 'rgba(138,178,241)'
-                },
-            },
-            axisLabel: {
-                show: true,
-                textStyle: {
-                    color: '#2b2b2b',
-                    margin: 15,
-                    fontSize: '14'
-                },
+        borderColor: '#f0f'
+      },
+      label: {
+        show: false
+      },
+      itemStyle: {
+        normal: {
+          color: '#0058ee'
+        }
+      },
+      // 区域填充样式
+      areaStyle: {
+        normal: {
+          // 线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
+          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+            offset: 0,
+            color: 'rgba(0,88,225,0.16)'
+          },
+          {
+            offset: 1,
+            color: 'rgba(0,88,225,0)'
+          }
+          ], false),
+          shadowColor: 'rgba(53,142,215, 0.9)', // 阴影颜色
+          shadowBlur: 20 // shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
+        }
+      },
+      data: ydata
+    }]
+  }
 
-            },
-            axisTick: {
-                show: false,
-            },
-        }],
-        series: [{
-            name: '使用量',
-            type: 'line',
-            showAllSymbol: true,
-            symbolSize: 0,
-            symbol: 'circle', 
-            symbolSize: 5,   //设定实心点的大小
-            lineStyle: {
-                normal: {
+  if (_option !== undefined) {
+    option = Object.assign({}, option, _option)
+  }
 
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: '#0058e1'
-                    }, {
-                        offset: 1,
-                        color: '#0058e1'
-                    }])
-                },
-                borderColor: '#f0f'
-            },
-            label: {
-                show: false,
-            },
-            itemStyle: {
-                normal: {
-                    color: "#0058ee",
-                }
-            },
-            // 区域填充样式
-            areaStyle: {
-                normal: {
-                    //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
-                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                        offset: 0,
-                        color: 'rgba(0,88,225,0.16)'
-                    },
-                    {
-                        offset: 1,
-                        color: 'rgba(0,88,225,0)'
-                    }
-                    ], false),
-                    shadowColor: 'rgba(53,142,215, 0.9)', //阴影颜色
-                    shadowBlur: 20 //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
-                }
-            },
-            data: ydata
-        }]
-    };
-
-    if (_option !== undefined) {
-        option = Object.assign({}, option, _option)
-    }
-
-    const client = document.getElementById(id);
-    let myChart = echarts.init(client);
-    const clientWidth = client.clientWidth;
-    const clientHeight = client.clientHeight;
-    myChart.clear();
-    myChart.resize({ width: clientWidth, height: clientHeight });
-    myChart.setOption(option);
+  const client = document.getElementById(id)
+  const myChart = echarts.init(client)
+  const clientWidth = client.clientWidth
+  const clientHeight = client.clientHeight
+  myChart.clear()
+  myChart.resize({ width: clientWidth, height: clientHeight })
+  myChart.setOption(option)
 }
diff --git a/back/src/views/modules/workBench/components/trend-view.vue b/back/src/views/modules/workBench/components/trend-view.vue
index 3ccaf9c1..68d95f63 100644
--- a/back/src/views/modules/workBench/components/trend-view.vue
+++ b/back/src/views/modules/workBench/components/trend-view.vue
@@ -8,108 +8,132 @@
           @click="handleTitleSwitch(idx)"
           class="top-title"
           :class="{ active: idx == selectedTitle }"
-        >{{ item }}</div>
+        >
+          {{ item }}
+        </div>
       </div>
     </content-title>
     <div id="trendId" class="trend-echart"></div>
   </div>
 </template>
 <script>
-import { trendLineChart } from "./lineOption";
-import contentTitle from "./content-title";
-import * as Apis from "../api";
+import { trendLineChart } from './lineOption'
+import contentTitle from './content-title'
+import * as Apis from '../api'
+import moment from 'moment'
 export default {
-  data() {
+  data () {
     return {
-      titles: ["近七日", "月度"],
+      titles: ['近七日', '月度'],
       selectedTitle: 0,
       trendChartData: {},
-      startDate: "",
-      endDate:
-        new Date().getFullYear() +
-        "-" +
-        (new Date().getMonth() + 1) +
-        "-" +
-        new Date().getDate()
-    };
+      startDate: '',
+      endDate: Math.round(new Date() / 1000),
+      ydata: [],
+      xaxis: []
+    }
   },
   components: {
     contentTitle
   },
-  mounted() {
-    this.initChart();
+  mounted () {
+    this.initChart()
   },
   watch: {
     selectedTitle: {
-      handler: function(newVal, oldVal) {
-        this.startDate = this.getData(newVal == 0 ? 7 : 30);
+      handler: function (newVal, oldVal) {
+        this.startDate = this.getData(newVal == 0 ? 7 : 30)
+        this.ydata = this.getday2(this.selectedTitle === 0 ? 7 : 30)
+        this.ydata.map((item) => {
+          this.xaxis.push(0)
+        })
       },
       deep: true,
       immediate: true
     }
   },
   methods: {
-    //发布动态
-    initChart() {
+    // 返回最近七天的日期
+    getday2 (index) {
+      const days = []
+      var Dates = new Date()
+      for (let i = 0; i <= 24 * (index - 1); i += 24) {
+        // 今天加上前6天
+        const dateItem = new Date(Dates.getTime() - i * 60 * 60 * 1000) // 使用当天时间戳减去以前的时间毫秒（小时*分*秒*毫秒）
+        const y = dateItem.getFullYear() // 获取年份
+        let m = dateItem.getMonth() + 1 // 获取月份js月份从0开始，需要+1
+        let d = dateItem.getDate() // 获取日期
+        m = this.addDate0(m) // 给为单数的月份补零
+        d = this.addDate0(d) // 给为单数的日期补零
+        const valueItem = y + '-' + m + '-' + d // 组合
+        days.unshift(valueItem) // 添加至数组
+      }
+      console.log('最近七天日期：', days)
+
+      return days
+    },
+
+    // 给日期加0
+    addDate0 (time) {
+      if (time.toString().length == 1) {
+        time = '0' + time.toString()
+      }
+      return time
+    },
+    // 发布动态
+    initChart () {
       Apis.getByDept(
         {
           startDate: this.startDate,
           endDate: this.endDate
         },
-        res => {
-          if (res.data.code !== 0) {
-            return;
-          }
-          this.data = res.data.data.browseDayList || [];
-          let xaxis = [],
-            ydata = [];
-          this.data.forEach(v => {
-            Object.keys(v).map((key, value) => {
-              xaxis.push(key);
-              ydata.push(value);
-            });
-          });
-          console.log(xaxis)
-            console.log(ydata)
+        (res) => {
+          // if (res.data.code !== 0) {
+          //   return
+          // }
+          this.data = res.data.data[0].values
+          this.data.map((item) => {
+            const time = moment(item[0] * 1000).format('YYYY-MM-DD')
+            this.ydata.map((itemSon, indexSon) => {
+              if (itemSon === time) {
+                this.xaxis[indexSon] = parseInt(item[1])
+              }
+            })
+          })
           this.trendChartData = {
-            xaxis: xaxis,
-            ydata: ydata
-          };
+            xaxis: this.ydata,
+            ydata: this.xaxis
+          }
           this.$nextTick(() => {
-            trendLineChart("trendId", this.trendChartData);
-          });
+            trendLineChart('trendId', this.trendChartData)
+          })
         },
-        err => {
-          console.log("err", err);
+        (err) => {
+          console.log('err', err)
         }
-      );
+      )
     },
-    handleTitleSwitch(idx) {
-      this.selectedTitle = idx;
-      this.startDate = this.getData(this.selectedTitle == 0 ? 7 : 30);
-      console.log(this.startDate);
-      this.initChart();
+    handleTitleSwitch (idx) {
+      this.selectedTitle = idx
+      this.startDate = this.getData(this.selectedTitle == 0 ? 7 : 30)
+      console.log(this.startDate)
+      this.initChart()
     },
-    getData(aa) {
-      let date1 = new Date(),
-        time1 =
-          date1.getFullYear() +
-          "-" +
-          (date1.getMonth() + 1) +
-          "-" +
-          date1.getDate(); //time1表示当前时间
-      let date2 = new Date(date1);
-      date2.setDate(date1.getDate() - aa);
-      let time2 =
-        date2.getFullYear() +
-        "-" +
-        (date2.getMonth() + 1) +
-        "-" +
-        date2.getDate();
-      return time2;
+    getData (aa) {
+      const date1 = new Date()
+      const time1 =
+        date1.getFullYear() +
+        '-' +
+        (date1.getMonth() + 1) +
+        '-' +
+        date1.getDate() // time1表示当前时间
+      const date2 = new Date(date1)
+      date2.setDate(date1.getDate() - aa)
+      const time2 = Math.round(date2 / 1000)
+      return time2
     }
   }
-};
+}
 </script>
 <style lang="scss" scoped>
 .trend {
@@ -141,4 +165,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/front/src/api/capabilityCloud.js b/front/src/api/capabilityCloud.js
index 8c72303b..d6e2e151 100644
--- a/front/src/api/capabilityCloud.js
+++ b/front/src/api/capabilityCloud.js
@@ -97,8 +97,15 @@ export function callTheTrendPort(start, end, params) {
 export function totalCallsSnum(params) {
   return request({
     url:
-      '/metrics/api/v1/query?query=sum(apigateway_http_status)&time=1655793262.495' +
-      params,
+      `metrics/api/v1/query?query=sum(increase(apigateway_http_status))&time=${params}`,
+    method: 'get',
+  })
+}
+//能力云图-调用成功次数
+export function totalCallsSnum2(params) {
+  return request({
+    url:
+      `metrics/api/v1/query?query=sum(increase(apigateway_http_status{code=~"^2.."}))&time=${params}`,
     method: 'get',
   })
 }
diff --git a/front/src/views/capabilityCloud/components/ComponentServices.vue b/front/src/views/capabilityCloud/components/ComponentServices.vue
index 799722d6..b3359fd0 100644
--- a/front/src/views/capabilityCloud/components/ComponentServices.vue
+++ b/front/src/views/capabilityCloud/components/ComponentServices.vue
@@ -119,6 +119,7 @@
     componentServiceRank,
     callTheTrendPort,
     totalCallsSnum,
+    totalCallsSnum2,
   } from '@/api/capabilityCloud'
   import * as moment from 'moment'
   let xinhaianIsShow = whoShow.itShowXiHaiAn //判断是否是西海岸版本
@@ -410,6 +411,13 @@
     if (!xinhaianIsShow) {
       totalCallsSnum(end).then((res) => {
         snum.value[1].num = res.data.data.result[0].value[1]
+        totalCallsSnum2(end).then((resSon) => {
+          snum.value[2].num =
+            ((snum.value[1].num - resSon.data.data.result[0].value[1]) /
+              snum.value[1].num) *
+              100 +
+            '%'
+        })
       })
     }
   }

From 428af8b74f7b654966f5e4d8d24f95030e933421 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Fri, 29 Jul 2022 09:08:06 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/public/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/back/public/index.html b/back/public/index.html
index c8f9e70b..5ba2148d 100644
--- a/back/public/index.html
+++ b/back/public/index.html
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-11 10:11:40
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-26 20:23:13
+ * @LastEditTime: 2022-07-28 20:14:40
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -45,9 +45,9 @@
       // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.166:8888/renren-admin';
     // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
     // window.SITE_CONFIG['apiURL'] = 'http://10.16.5.35:8888/renren-admin';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
     window.SITE_CONFIG['previewUrl'] = 'http://localhost:8080/';
-    // window.SITE_CONFIG['apiURL'] = 'http://15.2.23.141:8000/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // WebSocket地址
     window.SITE_CONFIG['socketURL'] ='ws://localhost:8080/renren-admin/websocket';
     </script>