Pārlūkot izejas kodu

reactor:设备接口联调及事件接口

liu_w601 3 mēneši atpakaļ
vecāks
revīzija
180074fc68

+ 12 - 2
src/components/base-panel/base-panel-right.vue

@@ -11,7 +11,7 @@
 <script>
 export default {
   name: 'BasePanelRight',
-  props:{
+ props:{
     isHidePanel:{
       type:Boolean,
       default:false
@@ -19,7 +19,17 @@ export default {
   },
   data() {
     return {
-      isHide: this.isHidePanel
+      isHide: false
+    }
+  },
+  mounted(){
+    this.$globalEventBus.$on('hideRightPanel',(val)=>{
+      this.isHide = val
+    })
+  },
+  watch:{
+    isHidePanel(val){
+      this.isHide = val
     }
   },
   methods: {

+ 9 - 1
src/views/components/tools/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="tools-container">
+    <div class="tools-container" :class="{hide:rightPanelHide}">
       <img src="@/assets/image/common/tools.png" alt="" @click="toOpenTools" />
       <div class="tools-menu" :class="{ isHide: !toolsShow }">
         <div class="tool" @click="toChangeMap" :class="{ active: isMapActive }"><i class="iconfont icon-tongyong-gongjuxiang-ditukongzhi" style="font-size: 40px"></i></div>
@@ -31,6 +31,7 @@ export default {
       rangingActive: false,
       isClActive: false,
       measureShow: false,
+      rightPanelHide:false,
       distanceMeasure: null, // 测距工具实例
       isMeasuring: false, // 是否正在测量
       measureResult: '' // 测量结果
@@ -55,6 +56,9 @@ export default {
       // 将测距工具添加到地图
       window.map.addThing(this.distanceMeasure)
     })
+    this.$globalEventBus.$on('toggleRightPanel',(val)=>{
+      this.rightPanelHide = val
+    })
   },
   methods: {
     toOpenTools() {
@@ -128,6 +132,7 @@ export default {
   },
   destroyed() {
     this.$globalEventBus.$off('loadMap')
+    this.$globalEventBus.$off('toggleRightPanel')
   }
 }
 </script>
@@ -178,4 +183,7 @@ export default {
     display: none;
   }
 }
+.hide{
+  right: px-to-rem(30);
+}
 </style>

+ 7 - 40
src/views/safety-inspection/index.vue

@@ -20,32 +20,17 @@ export default {
   },
   data() {
     return {
-      inspectionOptions: [
-        {
-          latitude: '28.189249',
-          longitude: '113.065505',
-          devName: '浏阳市中和丁字村无线机房_1"',
-          deviceCode: '43010000831327000018',
-          channelCode: '430100430000000021130000033'
-        },
-        {
-          latitude: '28.194911',
-          longitude: '113.066789',
-          devName: '长沙芙蓉区隆平路与望龙路交叉口-东瑞社区',
-          deviceCode: '43010000831327000019',
-          channelCode: '430100430000000021130000037'
-        }
-      ]
+      inspectionOptions: []
     }
   },
   mounted() {
-    this.getData()
+    this.fetchData()
   },
   methods: {
-    getData() {
-      window
+    fetchData(){
+       window
         .requestSDK(
-          '/ttdevice/ttview/device/queryDeviceInfoPage',
+          '/device/deviceSimpleList',
           {
             pageNum: 1,
             pageSize: 10,
@@ -56,35 +41,17 @@ export default {
           'post'
         )
         .then(async (res) => {
-          this.formatData(res.rows)
+          this.inspectionOptions = res.data
+          this.addInitialPoints()
         })
     },
-    formatData(data) {
-      this.inspectionOptions = data.map((item) => {
-        const result = {
-          latitude: item.latitude,
-          longitude: item.longitude,
-          devName: item.devName,
-          deviceCode: item.deviceCode,
-          channelCode: item.children && item.children.length > 0 ? item.children[0].channelCode : null
-        }
-        if (!item.children || item.children.length === 0) {
-          result.disabled = true
-        }
-        return result
-      })
-
-      this.addInitialPoints()
-    },
     refreshLeftList() {
       this.$refs.inspRef.getSecurityPatrolList()
     },
     // 添加初始点
     addInitialPoints() {
       this.inspectionOptions.forEach((point) => {
-        if(!point.disabled){
           this.addPointToMap(point)
-        }
       })
     },
 

+ 1 - 0
src/views/safety-inspection/left.vue

@@ -125,6 +125,7 @@ export default {
     display: flex;
     flex-direction: column;
     padding: px-to-rem(10);
+    padding-top: 0;
     height: 100%;
     overflow: auto;
     .v-collapse {

+ 6 - 2
src/views/smart-early-warning/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <Left @toLoadDetail="toLoadDetail"></Left>
-    <Right :info="detailInfo"></Right>
+    <Right :info="detailInfo" ></Right>
   </div>
 </template>
 
@@ -14,12 +14,16 @@ export default {
     },
     data(){
       return{
-        detailInfo:{}
+        detailInfo:{},
       }
     },
+    mounted(){
+      this.$globalEventBus.$emit('hideRightPanel',true)
+    },
     methods:{
       toLoadDetail(data){
         this.detailInfo = data
+        this.$globalEventBus.$emit('hideRightPanel',false)
       }
     }
 }

+ 4 - 94
src/views/smart-early-warning/left.vue

@@ -64,96 +64,7 @@ export default {
       pageSize: 6,
       total: 0,
       activeNames: [1, 2, 3, 4],
-      listItem: [
-        {
-          name: '乱建预警',
-          lists: [
-            {
-              imgUrl: ImgUrl,
-              deviceCode:'43030400831327000100',
-              deviceName:'咸宁阳兴平仪空村综合机房',
-              channelName:'咸宁阳兴平仪空村综合机房梯次LY',
-              longitude:'112.985866',
-              latitude:'27.814898',
-              address: '咸宁阳兴平仪空村综合机房',
-              confidenceLevel:'0.80615',
-              orderId:'202508251210241338766566',
-              alarmBody:'流域乱建预警',
-              warningSourceName: 'AI预警',
-              warningTypeName: '四乱预警',
-              emergencyLevelName:'一级',
-              alarmTime:'2025-08-25 09:36:31',
-              duration:'0小时0分11秒'
-            }
-          ]
-        },
-        {
-          name: '乱采预警',
-          lists: [
-             {
-              imgUrl: ImgUrl,
-              deviceCode:'43030400831327000100',
-              deviceName:'咸宁阳兴平仪空村综合机房',
-              channelName:'咸宁阳兴平仪空村综合机房梯次LY',
-              longitude:'112.985866',
-              latitude:'27.814898',
-              address: '咸宁阳兴平仪空村综合机房',
-              confidenceLevel:'0.80615',
-              orderId:'202508251210241338766566',
-              alarmBody:'流域乱采预警',
-              warningSourceName: 'AI预警',
-              warningTypeName: '四乱预警',
-              emergencyLevelName:'一级',
-              alarmTime:'2025-08-25 09:36:31',
-              duration:'0小时0分11秒'
-            }
-          ]
-        },
-        {
-          name: '乱堆预警',
-          lists: [
-            {
-              imgUrl: ImgUrl,
-              deviceCode:'43030400831327000100',
-              deviceName:'咸宁阳兴平仪空村综合机房',
-              channelName:'咸宁阳兴平仪空村综合机房梯次LY',
-              longitude:'112.985866',
-              latitude:'27.814898',
-              address: '咸宁阳兴平仪空村综合机房',
-              confidenceLevel:'0.80615',
-              orderId:'202508251210241338766566',
-              alarmBody:'流域乱堆预警',
-              warningSourceName: 'AI预警',
-              warningTypeName: '四乱预警',
-              emergencyLevelName:'一级',
-              alarmTime:'2025-08-25 09:36:31',
-              duration:'0小时0分11秒'
-            }
-          ]
-        },
-        {
-          name: '乱占预警',
-          lists: [
-             {
-              imgUrl: ImgUrl,
-              deviceCode:'43030400831327000100',
-              deviceName:'咸宁阳兴平仪空村综合机房',
-              channelName:'咸宁阳兴平仪空村综合机房梯次LY',
-              longitude:'112.985866',
-              latitude:'27.814898',
-              address: '咸宁阳兴平仪空村综合机房',
-              confidenceLevel:'0.80615',
-              orderId:'202508251210241338766566',
-              alarmBody:'流域乱占预警',
-              warningSourceName: 'AI预警',
-              warningTypeName: '四乱预警',
-              emergencyLevelName:'一级',
-              alarmTime:'2025-08-25 09:36:31',
-              duration:'0小时0分11秒'
-            }
-          ]
-        }
-      ]
+      listItem: []
     }
   },
   components: {
@@ -166,9 +77,9 @@ export default {
   },
   methods: {
     getData() {
-      window
+       window
         .requestSDK(
-          '/ttevent/alarm/order/getOrderList',
+          '/event/getEventListByType',
           {
             alarmTimeStart: moment().startOf('day').format('YYYY-MM-DD HH:mm:ss'),
             alarmTimeEnd: moment().endOf('day').format('YYYY-MM-DD HH:mm:ss'),
@@ -181,8 +92,7 @@ export default {
           'post'
         )
         .then(async (res) => {
-          
-          // this.listItem = data.rows
+          this.listItem = res.data
         })
     },
     toLoadDetail(data,index,i){

+ 8 - 8
src/views/water-station-popup/index.vue

@@ -60,7 +60,7 @@
             </el-row>
           </div>
           <div class="info-chart">
-            <LineChart style="height: 2.05rem" :options="swOption" v-if="chartShow"/>
+            <LineChart style="height: 2.05rem" :options="swOption" v-if="chartShow" />
           </div>
         </template>
         <template>
@@ -80,7 +80,7 @@
           <el-button type="primary" size="mini" @click="search">查询</el-button>
         </div>
         <div class="monitor-list">
-            <template v-if="monitorList.length > 0">
+          <template v-if="monitorList.length > 0">
             <ul>
               <li v-for="(item, index) in monitorList" :key="index" :class="{ active: activeIndex == index }">
                 <span @click="toLoadVideo(item, index)">{{ item.name }}</span>
@@ -96,7 +96,7 @@
               <div class="txt">暂无摄像头</div>
             </div>
           </template>
-          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -120,7 +120,7 @@ export default {
         width: '480px',
         height: '270px'
       },
-      chartShow:false,
+      chartShow: false,
       artShow: false,
       videoOption: {
         url: '',
@@ -276,7 +276,7 @@ export default {
             ]
           }
           this.swOption = option
-        }else{
+        } else {
           this.swOption = {}
           this.swInfo = {}
         }
@@ -285,7 +285,7 @@ export default {
     getAroundAnalysisOwnList() {
       window
         .requestSDK(
-          '/ttbdm/aroundAnalysisOwn/getAroundAnalysisOwnList',
+          '/device/aroundAnalysisList',
           {
             longitude: this.stationGraphic.coordinate[0],
             latitude: this.stationGraphic.coordinate[1],
@@ -329,7 +329,7 @@ export default {
             this.$set(this.videoOption, 'url', res.data.streamUrl)
           } else if (res.code == 4001) {
             this.$message.warning('设备离线')
-          }else if(res.code == 400){
+          } else if (res.code == 400) {
             this.$message.error(res.msg)
           }
         })
@@ -354,7 +354,7 @@ export default {
       })
       graphicsLayer.addGraphic(graphic)
     },
-    closeModal(){
+    closeModal() {
       this.visible = false
       this.radius = ''
       this.typeVal = '1'