暂存 staged

back/public/config/basicConfig.js

@@ -43,8 +43,8 @@ var CONFIGITEM = {
         },
         dev: {
             previewUrl: 'http://localhost:8080/',
-      apiURL: 'http://192.168.124.243:8888/ucs-admin',
+            apiURL: 'http://192.168.124.233:8888/ucs-admin',
-      websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
+            websocketURL: 'ws://192.168.124.233:8888/ucs-admin/websocket'
         }
     }
 }

front/public/static/config/basicConfig.js

@@ -8,8 +8,8 @@
 var _global = {}
 var CONFIGITEM = {
     // version: 'qingdao', //青岛
-  // version: 'xihaian', // 西海岸
+    version: 'xihaian', // 西海岸
-  version: 'dev', // 开发
+    //version: 'dev', // 开发
     // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
     // version: 'qingdao', // 测试
     //version: 'frp', // 内网穿透
@@ -30,8 +30,7 @@ var CONFIGITEM = {
             apiURL: 'http://15.72.183.90:8000/ucs-admin',
             websocketURL: '15.72.183.90:8000/ucs-admin',
             // websocketURL: '192.168.124.233:8888/ucs-admin',
-      POI_URL:
+            POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
-        'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
         },
         // 研发展厅
         zhanTingDev: {
@@ -49,8 +48,7 @@ var CONFIGITEM = {
             // websocketURL: '10.16.5.146:8888/ucs-admin', // 姜永超
             websocketURL: '10.18.1.99:8889/ucs-admin',
             // websocketURL: '10.16.5.35:8888/ucs-admin',
-      POI_URL:
+            POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
-        'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
         },
         // 西海岸大数据局
         xihaian: {
@@ -69,12 +67,12 @@ var CONFIGITEM = {
             },
             backUrl: 'http://10.134.135.9:9797',
             previewUrl: 'http://10.134.135.9:9796/',
+            apiURL: 'http://10.134.135.92:8888/renren-admin',
             // websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境
-      // websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境
+            websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境
-      websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄
+            //websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄
             // websocketURL: '10.18.1.99:8889/ucs-admin', // 研发
-      POI_URL:
+            POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
-        'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
         },
         // 开发
         dev: {
@@ -90,8 +88,7 @@ var CONFIGITEM = {
             apiURL: 'http://192.168.124.243:8888/ucs-admin',
             websocketURL: '192.168.124.243:8888/ucs-admin',
             // websocketURL: '10.18.1.99:8889/ucs-admin',
-      POI_URL:
+            POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
-        'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
         },
         // 测试
         test: {
@@ -105,8 +102,7 @@ var CONFIGITEM = {
             backUrl: 'http://192.168.124.243:9797',
             previewUrl: 'http://192.168.124.243:9796/',
             websocketURL: '192.168.124.243:8888/ucs-admin',
-      POI_URL:
+            POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
-        'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
         },
         // 内网穿透
         frp: {
@@ -120,8 +116,7 @@ var CONFIGITEM = {
             backUrl: 'http://124.222.94.39:9797',
             previewUrl: 'http://124.222.94.39:9796/',
             websocketURL: '124.222.94.39:8888/ucs-admin',
-      POI_URL:
+            POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
-        'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
         },
     },
 }

front/src/supermap/map-showResource.js

@@ -42,6 +42,8 @@ function updateProgressBar(processed, total, elapsed, layersArray) {
 function createMarkerClusterLayer(layerClassName) {
     let array = [];
     let markerClusterLayer = null
+        //let currentZoom = this.map._zoom
+        //console.log('zzzzzz', currentZoom);
     if (layerClassName) {
         // 如果存在类名，表示需要自定义图标
         markerClusterLayer = L.markerClusterGroup({

front/src/views/capacityOnTheShelf/Algorithm.vue

@@ -230,7 +230,7 @@
       >
         <button class="buzhou">提交</button>
       </a-popconfirm>
-      <button class="buzhou" v-else-if="服务商联系电话 === '部署与使用'" @click="submit()">
+      <button class="buzhou" v-else-if="showView === '部署与使用'" @click="submit()">
         提交
       </button>
        <button class="quxiao" @click="close()">取消</button>

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

@@ -2,7 +2,7 @@
 海康H5Player
 -->
 <template>
-  <div id='player' style="width:950px;height:600px"></div>
+  <div id='player' style="width:800px;height:600px;z-index:9999"></div>
 </template>
 <script>
 const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备

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

@@ -19,7 +19,7 @@
       :key="item.key"
       @click="jumpPage(item,'headerClick')"
       class="nav"
-      :class="[{'select':item.key == select},{'select-inner':(item.key == 'DetailsPageconetent' && item.innerKey == 'algorithmCompare'&& props.targetFlag)}]"
+      :class="[{'select':item.key == select},{'select-inner':(item.key == 'DetailsPageconetent' && item.innerKey && props.targetFlag)}]"
     >
       {{ item.name }}
     </div>
@@ -171,6 +171,7 @@
       }
     }
   }
+  console.log('3333333------------>', props)
   // 返回首页
   const goToHome = () => {
     // 西海岸
@@ -290,7 +291,7 @@
         break
       case '能力集市':
          router.push({
-           path: '/algorithmCompare',
+           path: targetRouter.value.path,
            query: {
              id: targetRouter.value.id,
            },
@@ -301,41 +302,11 @@
           path: '/capabilityCloud',
         })
         break
-      // case '技术文档':
-      //   router.push({
-      //     path: '/developmentGuide',
-      //   })
-      //   break
-      case '新手指南':
-        router.push({
-          path: '/instructionManual',
-        })
-        break
-      case '需求中心':
-        router.push({
-          path: '/demandCenter',
-        })
-        break
-      case '区市站点':
-        router.push({
-          path: '/mapTest',
-        })
-        break
       case '后台管理':
         Cookies.remove('JSESSIONID')
         window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
         // window.reload('http://15.2.21.238:9797')
         break
-      case '赋能案例':
-        router.push({
-          path: '/assignCase',
-        })
-        break
-      case '典型赋能案例':
-        router.push({
-          path: '/assignCase',
-        })
-        break
       case '融合服务':
         router.push({
           path: '/integrationServices',
@@ -431,8 +402,9 @@
     })
 
     mybus.on('changeMenuStyle', (data) => {
-      if(data.path=='/algorithmCompare'){
+      debugger
       targetRouter.value = data;
+      if(data.path=='/algorithmCompare'){
         jumpPage({
         "name": "能力集市",
         "key": "DetailsPageconetent",
@@ -440,6 +412,12 @@
        },'innerClick');
       } else if(data.path =='/DetailsPageconetent'){
         jumpPage({ name: '能力集市', key: 'DetailsPageconetent' },'headerClick')
+      } else if(data.path =='/details'){
+         jumpPage({
+        "name": "能力集市",
+        "key": "DetailsPageconetent",
+        "innerKey":"details"
+       },'innerClick');
       }
     })
 

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

@@ -609,12 +609,18 @@
             }
           } else {
             context.emit('saveSearchCodition')
-            router.push({
+            // router.push({
+            //   path: '/details',
+            //   query: {
+            //     id: item.id,
+            //   },
+            // });
+                 //修改顶部菜单的样式
+        let pathData = {
           path: '/details',
-              query: {
           id: item.id,
-              },
+        };
-            })
+         mybus.emit('changeMenuStyle',pathData);
           }
         }
       }

front/src/views/home/detailBack.vue

@@ -1,5 +1,11 @@
 <template>
-  <div class="detail-back" @click="previousPage" :style="{ color: textColor }">
+  <div>
+   <div class="nav-box">
+        <a-breadcrumb>
+          <a-breadcrumb-item @click="goToDetailsPageconetent" class="bread-crumb-span">能力集市</a-breadcrumb-item>
+          <a-breadcrumb-item>{{detailName}}</a-breadcrumb-item>
+        </a-breadcrumb>
+      </div>
   </div>
 </template>
 
@@ -24,20 +30,40 @@ const previousPage = () => {
 
 }
 
+const detailName = ref("应用资源")
 
 </script>
 
 <style scoped lang="less">
 .detail-back {
   position: absolute;
-  top: 0.85rem;
+  top: 0.6rem;
   left: 100px;
   font-size:  0.18rem;
   color: #fff;
   cursor: pointer;
   width: 50px;
   height: 50px;
-  background-image: url('~@/assets/detailsAll/back.png');
+  //background-image: url('~@/assets/detailsAll/back.png');
   background-size: 100% 100%;
 }
+  .nav-box {
+    position: absolute;
+    top: 0.6rem;
+  //left: 100px;
+  font-size:  0.18rem;
+  color: #fff;
+      height: 30px;
+      line-height:30px;
+      width: 100%;
+      font-size: 14px;
+      display: flex;
+      align-items: center;
+      background: rgba(244, 245, 248, 0.8);
+      padding-left: 145px;
+      padding-top: 5px;
+      .bread-crumb-span{
+         cursor: pointer;
+      }
+    }
 </style>

front/src/views/home/details.vue

@@ -8,11 +8,12 @@
 <template>
   <div>
     <div id="apply-container">
-      <home-header :showView="showView"></home-header>
+      <home-header :showView="showView" :target-flag = "targetFlag"></home-header>
       <detail-back></detail-back>
+      <div class="detail-content">
           <details-view v-if="showView === 'details-view'"></details-view>
       <algorithm-details
-        v-else-if="showView === 'algorithm-details'"
+        v-if="showView === 'algorithm-details'"
       ></algorithm-details>
       <application-details
         v-else-if="showView === 'application-details'"
@@ -24,6 +25,7 @@
         v-else-if="showView === 'business-details'"
       ></business-details>
       <layer-service v-else-if="showView === 'layer-service'"></layer-service>
+      </div>
       <home-footer></home-footer>
     </div>
   </div>
@@ -95,6 +97,7 @@
       const id = router.currentRoute.value.query.id
       const obj = JSON.parse(window.sessionStorage.getItem('preview'))
       let showView = ref('')
+      const targetFlag= ref(true)
       const init = () => {
         if (id) {
           selectOne(id).then((res) => {
@@ -171,6 +174,7 @@
         formState,
         options,
         showView,
+        targetFlag,
         init,
         router,
         id,
@@ -191,4 +195,7 @@
     flex-direction: column;
     justify-content: space-between;
   }
+   .detail-content{
+      margin-top:90px;
+    }
 </style>

front/src/views/home/detailsPageInfrastructureTreeXha.vue

@@ -193,7 +193,6 @@ export default defineComponent({
     })
 
     const onSelect = async (item, val, child) => {
-
       let res = {}
       if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
         res = await getCameraAllOrgan({ parentId: val.id })

front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue

@@ -20,13 +20,15 @@
                 :key="url"
                 :src="url"
               >
-              <!-- <div class="video-content" style=" z-index: 1">
+              <div class="video-content">
-              <h5-player :video-url = "videoUrl"></h5-player> 
+              <h5-player></h5-player> 
-              </div> -->
+              </div>
-              <div style="color:#000000">
+              <!-- <div style="color:#000000">
+              <div class="video-content" style=" z-index: 1">
               <h5-player :video-url="videoUrl"></h5-player> 
               </div>
-              <div> 
+              </div> -->
+              <div class="footer-button"> 
                 <a-button type="primary" @click="applyNow(url)">立即申请</a-button>
                 <a-button type="primary" style="margin-left:20px" @click="addIntoCart(url)">加入申购车</a-button>
                 </div>
@@ -164,6 +166,18 @@
     width: 960px;
     //height: 700px;
     margin-left: 8px;
+     .video-content{
+     width: 950px;
+     height:600px; 
+     text-align: left; 
+     padding: 5px;
+    }
+    .footer-button{
+       width: 950px;
+       //height:50px; 
+       text-align: center; 
+       padding-top:20px;
+    }
   }
   .ant-carousel :deep(.slick-slide) {
     text-align: center;
@@ -199,18 +213,7 @@
   .ant-carousel :deep(.slick-dots) {
    display: none !important;
   }
-    .video-content{
+   
-     width: 950px;
-     height:600px; 
-     text-align: left; 
-     padding: 5px;
-    }
-    .footer-button{
-       width: 950px;
-       height:50px; 
-       text-align: center; 
-       padding-top:20px;
-    }
   }
   // .current-video {
   //   width: 320px;

front/src/views/home/videoSurveillance/index.vue

@@ -153,7 +153,7 @@ import { ElMessage } from 'element-plus'
     },
     components: {
       TiledMap,
-      VideoPlay,
+      VideoPlay
     },
     created() {},
     watch: {
@@ -199,7 +199,7 @@ import { ElMessage } from 'element-plus'
         //this.addResourceTomap('videoMap', this.pointAllData);
       })
 
-      //摄像头数据上图
+      //所有摄像头数据上图
        mybus.off('cameraDataOnMap')
       mybus.on('cameraDataOnMap', (data) => {
           this.addResourceTomap('videoMap', data)
@@ -738,6 +738,14 @@ import { ElMessage } from 'element-plus'
       z-index: 988;
       cursor: pointer;
     }
+    .input-with-select{
+      width: 2.4rem;
+      svg{
+        position: relative;
+        bottom: 0;
+        right: 0;
+      }
+    }
     .icon-poylon {
       width: 0.46rem;
       bottom: 0.6rem;