front/public/static/config/basicConfig.js

@@ -8,9 +8,9 @@
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
-  version: 'xihaian', // 西海岸
+  // version: 'xihaian', // 西海岸
   // version: 'dev', // 开发
-  // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
+  version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   //version: 'test', // 测试
   //version: 'frp', // 内网穿透
   vNum: 'v0.8.7.2',
@@ -62,8 +62,7 @@ var CONFIGITEM = {
       },
       backUrl: 'http://10.134.135.9:9797',
       previewUrl: 'http://10.134.135.9:9796/',
-      websocketURL: '10.134.135.9:8888/renren-admin', // 正式环境
-      websocketURL: '10.134.135.92:8888/renren-admin', // 测试环境
+      websocketURL: '10.134.135.9:8888/renren-admin',
       // websocketURL: '10.18.1.99:8889/renren-admin', // 研发
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',

front/src/api/file.js

@@ -99,7 +99,7 @@ export function getHls(params) {
 }
 //能力集市基础设施-左侧列表
 export function getCameraInfoByAreaId(params) {
-  return axios.get(`http://10.134.135.92:9537/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
+  return axios.get(`http://10.134.135.92:9537/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}&status=${params.status}`,
     config2
   )
 }

front/src/views/home/detailsPageInfrastructureTree.vue

@@ -136,6 +136,7 @@
           } else {
             getCameraInfoByAreaId({
               areaId: '70be8c5b664f4bcf869d82f2e8335051',
+              status: 1,
             }).then((res) => {
               treeData.value = res.data.data
             })
@@ -269,6 +270,7 @@
         } else {
           getCameraInfoByAreaId({
             areaId: val.id,
+            status: 1,
           }).then((res) => {
             treeData.value.map((treeDataItem, index) => {
               if (item.id == treeDataItem.id) {
@@ -343,6 +345,7 @@
         } else {
           getCameraInfoByAreaId({
             areaId: item.id,
+            status: 1,
           }).then((res) => {
             treeData.value.map((treeDataItem, index) => {
               if (item.id == treeDataItem.id) {

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

@@ -226,6 +226,7 @@
             longitude: this.mapSearchParam.gpsX || '',
             latitude: this.mapSearchParam.gpsY || '',
             radius: this.mapSearchParam.radius || '',
+            status: 1,
           }
           let paramsFather = ''
           let i = 1

front/src/views/login/index.vue

@@ -42,9 +42,6 @@ import { Encrypt } from '@/utils/crypto'
 import { UserOutlined, LockOutlined } from '@ant-design/icons-vue'
 import { message, Modal } from 'ant-design-vue'
 
-// 是否是西海岸
-const isXiHaiAn = whoShow.itShowXiHaiAn
-
 export default {
   name: 'Login',
   components: {
@@ -148,19 +145,7 @@ export default {
         window.sessionStorage.setItem('visits', JSON.stringify([]))
         console.log('添加visits========================================>')
         // console.log(this.handleRoute())
-        // 西海岸特殊处理
-        if (isXiHaiAn) {
-          await this.$router.push({
-            path: '/DetailsPageconetent',
-            query: {
-              select: '基础设施',
-              tecHnosphere: '',
-              appLiCation: ''
-            }
-          })
-        } else {
-          await this.$router.push('/home')
-        }
+        await this.$router.push('/home')
       } catch (error) {
         message.error('登陆失败，用户名或密码错误！')
       }

front/src/views/personalCenter/components/AbilityApplication.vue

@@ -187,7 +187,7 @@
                 </div>
                 <a-button
                     type="primary"
-                    v-if="item.approveStatus == '通过' && whoShow1.itShowXiHaiAn"
+                    v-if="item.approveStatus === '通过' && whoShow1.itShowXiHaiAn"
                     @click.stop="openVideo(val)"
                   >
                   视频预览
@@ -440,9 +440,6 @@
   // 视频预览
   const openVideo = (item) => {
     console.log('打开视频', item)
-    if(item && item.status != 1) {
-      return message.error('当前视频离线不可预览!')
-    }
     const param = {
       key: item.cameraId,
     }