合并版本v0.8.3.2

时间
后台能力运行监控
2022-07-29 09:12:15 +08:00 · 2022-07-29 09:08:06 +08:00 · 2022-07-28 20:40:48 +08:00 · 2022-07-28 20:37:08 +08:00 · 2022-07-28 20:20:34 +08:00 · 2022-07-28 20:12:50 +08:00
24 changed files with 2262 additions and 1731 deletions
--- 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>
--- 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 } }
  ]
 }
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@ -801,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 }) => {
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@ -709,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 }) => {
--- 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"
--- 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"
--- 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"
--- 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
      })
    },
--- 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%;

--- 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通用方法
    // 请求趋势图
--- 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
--- 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,6 +236,8 @@ export default {
        if (!valid) {
          return false
        }
+        if (this.submitFlag) {
+          this.submitFlag = false
          this.dataForm.password = Encrypt(this.dataForm.password)
          if (this.dataForm.id) {
            delete this.dataForm.password
@ -242,7 +261,9 @@ export default {
                this.$emit('refreshDataList')
              }
            })
+            this.submitFlag = true
          }).catch(() => {})
+        }
      })
    }, 1000, { leading: true, trailing: false })
  }
--- a/back/src/views/modules/workBench/api.js
+++ b/back/src/views/modules/workBench/api.js
@ -1,10 +1,10 @@
 // /resource/getByDept
-import http from '@/utils/request';
+import http from '@/utils/request'

 function Request({
  methods, url, data, success, fali
 }) {
-    let _key = methods == 'get' ? 'params' : 'data';
+  const _key = methods == 'get' ? 'params' : 'data'
  return new Promise((resolve, reject) => {
    http[methods](url, {
      [_key]: data
@ -14,7 +14,6 @@ function Request({
      reject(err)
    })
  })
-
 }
 function RequestPost({
  methods, url, data, success, fali
@ -28,7 +27,6 @@ function RequestPost({
      reject(err)
    })
  })
-
 }

 // /resource/getByDept:获取当前登录用户所在部门发布的资源
@ -72,7 +70,6 @@ export const getTotalByDept = (data, success, fail) => {
  })
 }

-
 // 部门申请
 export const getApply = (data, success, fail) => {
  Request({
@ -141,9 +138,8 @@ export const getApplyByDept = (data, success, fail) => {
 // 部门发布能力被调用趋势
 export const getByDept = (data, success, fail) => {
  RequestPost({
-        methods: 'post',
-        url: '/resource/trafficDeptResource',
-        data
+    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 => {
--- a/back/src/views/modules/workBench/components/lineOption.js
+++ b/back/src/views/modules/workBench/components/lineOption.js
@ -1,42 +1,41 @@
 import * as echarts from 'echarts'
-//折线图
+// 折线图
 export const trendLineChart = (id, chartData, _option) => {
-
-    let { xaxis = [], ydata = [], } = chartData;
+  const { xaxis = [], ydata = [] } = chartData
  let option = {
    tooltip: {
-            trigger: 'axis',
+      trigger: 'axis'
    },
    grid: {
      top: '16%',
      left: '7%',
      right: '7%',
-            bottom: '10%',
+      bottom: '10%'
    },
    xAxis: [{
      type: 'category',
      boundaryGap: true,
-            axisLine: { //坐标轴轴线相关设置。数学上的x轴
+      axisLine: { // 坐标轴轴线相关设置。数学上的x轴
        show: true,
        lineStyle: {
          color: 'rgba(138,178,241)'
+        }
      },
-            },
-            axisLabel: { //坐标轴刻度标签的相关设置
+      axisLabel: { // 坐标轴刻度标签的相关设置
        textStyle: {
          color: '#2b2b2b',
          margin: 15,
          fontSize: '14'
-                },
+        }
      },
      axisTick: {
-                show: false,
+        show: false
      },
-            data: xaxis,
+      data: xaxis
    }],
    yAxis: [{
      name: '使用量(万次)',
-            nameTextStyle:{color:"#2b2b2b"},
+      nameTextStyle: { color: '#2b2b2b' },
      type: 'value',
      min: 0,
      max: 100,
@ -51,7 +50,7 @@ export const trendLineChart = (id, chartData, _option) => {
        show: true,
        lineStyle: {
          color: 'rgba(138,178,241)'
-                },
+        }
      },
      axisLabel: {
        show: true,
@ -59,12 +58,12 @@ export const trendLineChart = (id, chartData, _option) => {
          color: '#2b2b2b',
          margin: 15,
          fontSize: '14'
-                },
+        }

      },
      axisTick: {
-                show: false,
-            },
+        show: false
+      }
    }],
    series: [{
      name: '使用量',
@ -72,7 +71,7 @@ export const trendLineChart = (id, chartData, _option) => {
      showAllSymbol: true,
      symbolSize: 0,
      symbol: 'circle',
-            symbolSize: 5,   //设定实心点的大小
+      symbolSize: 5, // 设定实心点的大小
      lineStyle: {
        normal: {

@ -87,17 +86,17 @@ export const trendLineChart = (id, chartData, _option) => {
        borderColor: '#f0f'
      },
      label: {
-                show: false,
+        show: false
      },
      itemStyle: {
        normal: {
-                    color: "#0058ee",
+          color: '#0058ee'
        }
      },
      // 区域填充样式
      areaStyle: {
        normal: {
-                    //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
+          // 线性渐变，前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)'
@ -107,23 +106,23 @@ export const trendLineChart = (id, chartData, _option) => {
            color: 'rgba(0,88,225,0)'
          }
          ], false),
-                    shadowColor: 'rgba(53,142,215, 0.9)', //阴影颜色
-                    shadowBlur: 20 //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
+          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)
 }
--- 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;
+        (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.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)
+            })
+          })
          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 =
+    getData (aa) {
+      const date1 = new Date()
+      const 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;
+        '-' +
+        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 {
--- 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',
  })
 }
--- 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',
--- 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 +
+            '%'
+        })
      })
    }
  }
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@ -11,75 +11,42 @@
      </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="
+          <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="
+        <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="
+        ">
+          <a-image :width="106" :preview="false" :src="
            item.infoList.filter((val) => val.attrType == '应用图片')[0]
              .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="
+        <div class="left" :class="
          item.type == '应用资源'
            ? 'yyzy'
            : !item.type
@ -104,55 +71,36 @@
                          .attrValue == '业务组件'
                        ? 'ywzj'
                        : ''
-          "
-          v-else-if="
+        " v-else-if="
  selectCardsname !== '基础设施' && selectCardsname !== '融合服务'
-          "
-        ></div>
+"></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="
+            <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="
+                <div v-if="
                  selectCardsname !== '数据资源' &&
                  selectCardsname !== '融合服务'
-                  "
-                >
+                ">
                  浏览量：{{ item.visits || 0 }}次
                </div>
-                <div
-                  v-if="
+                <div v-if="
                  selectCardsname !== '数据资源' &&
                  selectCardsname !== '融合服务' &&
                  (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
-                  "
-                >
+                ">
                  申请量：{{ item.applyCount || 0 }}次
                </div>
-                <div
-                  v-if="
+                <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="
+                <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>
+                ">
+                  <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="
+              <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,14 +213,10 @@
              >
                免费试用
              </a-button> -->
-              <a-button
-                type="primary"
-                @click="toView('apply', item)"
-                v-show="
+              <a-button type="primary" @click="toView('apply', item)" v-show="
                cardType == '组件服务' ||
                (cardType == '应用资源' && whoShow1.itShowQingDao)
-                "
-              >
+              ">
                {{
                    item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                }}
@ -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,20 +242,20 @@
  </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 {
+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: () => {},
+      default: () => { },
    },
    resourceTotal: {
      type: String,
@ -553,6 +452,14 @@
          )
        }
      } else if (props.selectCardsname === '融合服务') {
+        // 打包模式
+        router.push({
+          path: '/packagingDetails',
+          query: {
+            id: item.id,
+          },
+        })
+      } else if (props.selectCardsname === '赋能场景') {
        router.push({
          path: '/integrationServicesDetails',
          query: {
@ -683,7 +590,7 @@
    // 融合服务--一键申请
    const handleAKeyApplication = (item) => {
      let _applyList = []
-        ;(item.fuseResourceList || []).map((v) => {
+        ; (item.fuseResourceList || []).map((v) => {
          let resource = v.resource || {}
          let obj = {
            arr: [
@ -812,13 +719,14 @@
    mybus.off('chongzhi')
    // mybus.emit('changeSelcted')
  },
-  }
+}
 </script>
 <style scoped lang="less">
-  #search-result-list-container {
+#search-result-list-container {
  width: 1088px;
  padding: 0 20px;
  background: #f3f5f9;
+
  .detail-content {
    // 超出
    white-space: nowrap;
@ -827,6 +735,7 @@
    width: 130px;
    display: inline-block;
  }
+
  .shai-xuan {
    width: 1047px;
    height: 36px;
@ -836,6 +745,7 @@
    display: flex;
    align-items: center;
    position: relative;
+
    .circle {
      width: 16px;
      height: 16px;
@ -846,24 +756,30 @@
      line-height: 16px;
      margin-right: 21px;
    }
+
    .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;
@ -872,6 +788,7 @@
          display: flex;
          justify-content: center;
          align-items: center;
+
          .arrow {
            display: inline-block;
            width: 12px;
@ -879,6 +796,7 @@
            background: url('~@/assets/newHome/arrow.png');
            margin-left: 10px;
          }
+
          .down {
            background: url('~@/assets/newHome/down.png');
            margin-top: 6px;
@ -887,6 +805,7 @@
      }
    }
  }
+
  .result-list {
    width: 1048px;
    display: flex;
@ -895,72 +814,89 @@
    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;
+
      .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 {
        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;
          }
+
          div {
            margin-right: 24px;
          }
+
          .label-content {
            flex: 1;
            display: flex;
            justify-content: flex-end;
+
            .label {
              padding: 0.01rem 0.1rem;
              margin-right: 0.1rem;
@ -969,17 +905,20 @@
            }
          }
        }
+
        .header-right:last-child {
          div {
            margin-right: 16px;
          }
        }
+
        span {
          font-size: 20px;
          font-weight: 600;
          // color: #0087ff;
        }
      }
+
      .dec {
        overflow: hidden;
        text-overflow: ellipsis;
@ -987,12 +926,14 @@
        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;
@ -1007,11 +948,13 @@
          word-break: break-all;
        }
      }
+
      .btn {
        display: flex;
        justify-content: space-between;
        font-size: 14px;
        margin: 5px 0;
+
        // .left {
        //   width: 600px;
        //   display: flex;
@ -1031,6 +974,7 @@
          justify-content: flex-end;
          margin: 0 10px;
          align-items: center;
+
          .shopping {
            span {
              display: inline-block;
@ -1039,14 +983,17 @@
              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');
            }
          }
+
          .pk-on {
            display: inline-block;
            height: 32px;
@ -1057,17 +1004,20 @@
            background: url('~@/assets/newHome/pk-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;
@ -1075,6 +1025,7 @@
              background: url('~@/assets/newHome/sc-on.png');
            }
          }
+
          .ant-btn {
            background: transparent;
            background: #0058e1;
@ -1089,31 +1040,38 @@
            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 {
+
+        &>div {
          display: flex;
          align-items: center;
-            & > div {
+
+          &>div {
            margin: 0 10px;
          }
        }
+
        .pingfen {
          :deep(span) {
            display: flex;
            align-items: center;
+
            :deep(ul) {
              display: flex;
              align-items: center;
+
              :deep(.ant-rate-star:not(:last-child)) {
                margin-right: 4px;
              }
@ -1122,12 +1080,14 @@
        }
      }
    }
+
    .item:nth-of-type(1) {
      margin-top: 0;
    }
  }
-  }
-  .description {
+}
+
+.description {
  max-width: 990px;
  height: 52px;
  font-size: 14px;
@ -1141,5 +1101,5 @@
  /*超出显示为省略号*/
  -webkit-box-orient: vertical;
  word-break: break-all;
-  }
+}
 </style>
--- 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 = ''
--- a/front/src/views/home/integrationServices.vue
+++ b/front/src/views/home/integrationServices.vue
@ -5,11 +5,7 @@
    <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>
        </div>
@ -17,44 +13,20 @@
      <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,17 +34,17 @@
  <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({
+export default defineComponent({
  setup() {
    // 分页
    const loading = ref(true)
@ -256,10 +228,10 @@
    mybus.off('refresh')
    mybus.off('changePage')
  },
-  })
+})
 </script>
 <style lang="less" scoped>
-  .resultListSearchInput-father {
+.resultListSearchInput-father {
  background: #f3f5f9;
  padding: 0.2rem;

@ -276,9 +248,9 @@
      margin-top: 0.2rem;
    }
  }
-  }
+}

-  .resultListSearchInput {
+.resultListSearchInput {
  margin-left: 0.1rem;

  :deep(.ant-input) {
@ -303,9 +275,9 @@
  :deep(.ant-input-group-addon) {
    left: 0 !important;
  }
-  }
+}

-  .button-reset {
+.button-reset {
  border: 0;
  outline: none;
  width: 0.8rem;
@ -318,9 +290,9 @@
  line-height: 0.34rem;
  margin-left: 2.5rem;
  cursor: pointer;
-  }
+}

-  .details-pageconetent {
+.details-pageconetent {
  height: 100%;
  width: 100%;
  display: flex;
@ -359,16 +331,19 @@
    .top-title {
      padding: 0.2rem;
      display: flex;
-        font-size: 22px;
+      font-size: 18px;
+
      .tabAll {
-          font-size: 22px;
+        font-size: 18px;
        color: #000000;
        margin-right: 35px;
        cursor: pointer;
      }
+
      .tabAll:nth-child(1) {
        margin-left: 20px;
      }
+
      .sel {
        font-weight: 600;
        color: #0087ff;
@ -376,13 +351,13 @@
      }
    }
  }
-  }
+}

-  :deep(.ant-card-grid) {
+:deep(.ant-card-grid) {
  overflow: hidden;
  white-space: nowrap;
  text-overflow: ellipsis;
  -webkit-line-clamp: 1;
  word-break: break-all;
-  }
+}
 </style>
--- 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,47 +74,22 @@
      </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 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>
-      </div>
-    </div>
-
-    <!-- 常见问题-->
-    <application-common-problem
-      :dataList="detailInfoObj"
-      id="common-problem"
-      class="scrollBox"
-    ></application-common-problem>

    <home-footer></home-footer>
  </div>
@ -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);
--- a/front/src/views/home/packagingDetails.vue
+++ 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>
--- 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 = ''
Author	SHA1	Message	Date
wuhongjian	dbb6d55bce	合并版本v0.8.3.2	2022-07-29 09:12:15 +08:00
wuhongjian	428af8b74f	时间	2022-07-29 09:08:06 +08:00
851673013@qq.com	8376fb23d5	后台能力运行监控	2022-07-28 20:40:48 +08:00
a0049873	bab0c94093	BUG修改	2022-07-28 20:37:08 +08:00
a0049873	fb78805786	BUG修改	2022-07-28 20:20:34 +08:00
a0049873	1c7bdef115	修改BUG	2022-07-28 20:12:50 +08:00
a0049873	fabd0da877	更改西海岸字段	2022-07-28 19:35:42 +08:00
guoyue	488dbfbe5f	Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev	2022-07-28 17:54:49 +08:00
guoyue	816d07495c	打包模式详情页添加	2022-07-28 17:52:31 +08:00
lizhicheng2	d9139ae621	赋能场景详情-初步完成	2022-07-28 17:36:23 +08:00
a0049873	ea3f4b3da1	弹窗禁用点击遮罩层	2022-07-28 17:23:57 +08:00
a0049873	fc524a6b43	BUG修改	2022-07-28 17:12:30 +08:00