From 79ee4f9eb43af5321c3037a87819affd09468481 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Fri, 11 Aug 2023 16:14:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=91=E6=8E=A7=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8B=E8=AE=BE=E5=A4=87=E8=B7=B3=E8=BD=AC=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/equipment/index.js                 |  8 +++
 src/components/monitoring/conditioner.vue  |  9 ++-
 src/components/monitoring/door.vue         |  9 ++-
 src/components/monitoring/electricity.vue  | 78 +++++++++++++++++++---
 src/components/monitoring/firefighting.vue |  9 ++-
 src/components/monitoring/lift.vue         |  9 ++-
 src/components/monitoring/light.vue        |  9 ++-
 src/components/monitoring/monitoring.vue   |  9 ++-
 src/components/monitoring/wall.vue         |  9 ++-
 src/components/monitoring/warm.vue         |  9 ++-
 src/components/monitoring/water.vue        |  9 ++-
 11 files changed, 146 insertions(+), 21 deletions(-)

diff --git a/src/api/equipment/index.js b/src/api/equipment/index.js
index 2da9120..05aebe0 100644
--- a/src/api/equipment/index.js
+++ b/src/api/equipment/index.js
@@ -307,3 +307,11 @@ export const saveImg = (data) => {
     data,
   });
 };
+
+export const getDetail = (query) => {
+  return request({
+    url: "/api/blade-desk/equip/detail-by-code",
+    method: "get",
+    params: query,
+  });
+};
diff --git a/src/components/monitoring/conditioner.vue b/src/components/monitoring/conditioner.vue
index 9101b25..2541187 100644
--- a/src/components/monitoring/conditioner.vue
+++ b/src/components/monitoring/conditioner.vue
@@ -105,7 +105,7 @@
 				<span class="btn" @click="searchDevice" style="cursor: pointer;">查询</span>
 			</div> -->
       <div class="tabBox">
-        <el-table :data="tableData" style="width: 100%; max-height: 220px">
+        <el-table :data="tableData" style="width: 100%; max-height: 220px"  @row-contextmenu="tableContext">
           <el-table-column label="设备名称" min-width="100px" style="cursor: pointer">
             <template slot-scope="scope">
               <div class="flex-center-center" @click="clickConditions(scope.row)" style="cursor: pointer">
@@ -557,6 +557,13 @@ export default {
   },
 
   methods: {
+    tableContext(row,column, event){
+			event.preventDefault(); // 阻止默认菜单
+			const routerUrl = this.$router.resolve({ path: '/equipment/index', query: {code: row.code } });
+			window.open(routerUrl.href, "_blank");
+		//  this.dialogVisible = true
+		// console.log(row)
+		},
     //确认告警 - 重新查询告警列表
     doCancelWarn(item) {
       getCancelWarn(item.id).then((res) => {
diff --git a/src/components/monitoring/door.vue b/src/components/monitoring/door.vue
index 5b44b5a..d4def67 100644
--- a/src/components/monitoring/door.vue
+++ b/src/components/monitoring/door.vue
@@ -211,7 +211,7 @@
             cursor: pointer;
             background-color: transparent;
             max-height: 220px;
-          " :class="bimModel == 2 ? 'tataitab' : ''">
+          " :class="bimModel == 2 ? 'tataitab' : ''" @row-contextmenu="tableContext">
           <el-table-column label="设备名称" min-width="110px" align="left">
             <template slot-scope="scope">
               <div class="flex-center dev_name" style="overflow: hidden; white-space: nowrap">
@@ -1139,6 +1139,13 @@ export default {
       // console.log(row)
       this.bjClick(row);
     },
+    tableContext(row,column, event){
+        event.preventDefault(); // 阻止默认菜单
+        const routerUrl = this.$router.resolve({ path: '/equipment/index', query: {code: row.code } });
+        window.open(routerUrl.href, "_blank");
+      //  this.dialogVisible = true
+      // console.log(row)
+    },
     // 点击查询
     inquireHandle() {
       this.getSblb();
diff --git a/src/components/monitoring/electricity.vue b/src/components/monitoring/electricity.vue
index eaebc79..4ab6f48 100644
--- a/src/components/monitoring/electricity.vue
+++ b/src/components/monitoring/electricity.vue
@@ -280,12 +280,16 @@
     <!-- 设备列表 -->
     <div class="tab" :class="bimModel == 2 ? 'tataigen' : ''">
       <div class="title flex-center">
-        <img src="../../../public/img/monitoring/electricity/listIcon3.png" />
-        <span id="eletric_box">设备列表</span>
+        <div style="display:flex">
+          <img src="../../../public/img/monitoring/electricity/listIcon3.png" />
+          <span >设备列表</span>
+        </div>
+        
+        <div class="more_btn" style="margin-right:34px;cursor: pointer;" @click="clickMore">更多</div>
       </div>
-      <div class="tabBox">
-        <el-table @row-click="tableClick" :data="tableData" style="width: 100%"
-          :class="bimModel == 2 ? 'tataitab' : ''">
+      <div class="tabBox" id="eletric_box">
+        <el-table @row-click="tableClick" :data="tableData" style="width: 100%" @row-contextmenu="tableContext"
+          :class="bimModel == 2 ? 'tataitab' : ''" >
           <el-table-column label="电表名称" width="130">
             <template slot-scope="scope">
               <div class="flex-center dev_name">
@@ -344,6 +348,42 @@
         </el-pagination>
       </div>
     </div>
+    <el-dialog
+      title="设备详情"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :append-to-body="true"
+      :before-close="handleClose">
+      <span>设备类型：电力</span>
+      <div>
+        <div class="title" style="font-size: 18px;padding-bottom: 10px;border-bottom: 1px dashed;margin-top: 10px;">通讯地址</div>
+        <span style="display: inline-block;width: 33%;margin: 10px 0;">IP地址：192.168.20.101</span>
+        <span style="display: inline-block;width: 33%;margin: 10px 0;">端口号：502</span>
+        <span style="display: inline-block;width: 33%;margin: 10px 0;">数据偏移量：12</span>
+      </div>
+      <div>
+        <div class="title" style="font-size: 18px;padding-bottom: 10px;border-bottom: 1px dashed;margin-top: 10px;">设备编码</div>
+        <span style="display: inline-block;width: 33%;margin: 10px 0;">模型：业务区</span>
+        <span style="display: inline-block;width: 33%;margin: 10px 0;">楼栋：1号楼</span>
+        <span style="display: inline-block;width: 33%;margin: 10px 0;">楼层：01</span>
+      </div>
+      <div>
+        <div class="title" style="font-size: 18px;padding-bottom: 10px;border-bottom: 1px dashed;margin-top: 10px;">基础配置</div>
+        <span style="display: inline-block;width: 33%;margin: 10px 0;">编码：10100000001</span>
+        <span style="display: inline-block;width: 33%;margin: 10px 0;">名称：1号楼B1</span>
+        <span style="display: inline-block;width: 33%;margin: 10px 0;">简称：净水器</span>
+        <span style="display: inline-block;width: 33%;margin: 10px 0;">使用时间：净水器</span>
+        <span style="display: inline-block;width: 33%;margin: 10px 0;">具体位置：WH2</span>
+        <span style="display: inline-block;width: 33%;margin: 10px 0;">固定资产编号：</span>
+        <span style="display: inline-block;width: 33%;margin: 10px 0;">维保人：</span>
+        <span style="display: inline-block;width: 33%;margin: 10px 0;">维保电话：</span>
+        <span style="display: inline-block;width: 33%;margin: 10px 0;">维保时间：</span>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -412,6 +452,7 @@ export default {
   },
   data() {
     return {
+      dialogVisible:false,
       current: 1, //当前页
       size: 5, //每页数量
       total: 14, //总条目数
@@ -457,12 +498,13 @@ export default {
   },
   mounted() {
     this.getNavigationMap();
-    let dom = document.getElementById('eletric_box');
-    dom.addEventListener('contextmenu', (event)=> {
-      event.preventDefault(); // 阻止默认菜单
-      const routerUrl = this.$router.resolve({ path: '/equipment/index', query: { classCode: '0100' } });
-      window.open(routerUrl.href, "_blank");
-    });
+    // let dom = document.getElementById('eletric_box');
+    // dom.addEventListener('contextmenu', (event)=> {
+    //   console.log(event)
+    //   event.preventDefault(); // 阻止默认菜单
+    //   // const routerUrl = this.$router.resolve({ path: '/equipment/index', query: { classCode: '0100' } });
+    //   // window.open(routerUrl.href, "_blank");
+    // });
   },
   watch: {
     bimModel: {
@@ -648,6 +690,11 @@ export default {
     },
   },
   methods: {
+    // 点击更多按钮
+    clickMore(){
+      const routerUrl = this.$router.resolve({ path: '/equipment/index', query: { classCode: '0100' } });
+      window.open(routerUrl.href, "_blank");
+    },
     //确认告警 - 重新查询告警列表
     doCancelWarn(item) {
       getCancelWarn(item.id).then((res) => {
@@ -710,6 +757,13 @@ export default {
     tableClick(row, column, event) {
       this.bjClick(row);
     },
+    tableContext(row,column, event){
+        event.preventDefault(); // 阻止默认菜单
+        const routerUrl = this.$router.resolve({ path: '/equipment/index', query: {code: row.code } });
+        window.open(routerUrl.href, "_blank");
+      //  this.dialogVisible = true
+      // console.log(row)
+    },
     // 添加标签
     addLabel(objectId, name, type, location, dataNum) {
       // 构件id/设备名称/设备状态/设备位置/累计电量
@@ -1971,6 +2025,8 @@ export default {
       color: #fff;
       font-size: 15px;
       font-weight: bold;
+      display: flex;
+      justify-content: space-between;
 
       img {
         display: block;
diff --git a/src/components/monitoring/firefighting.vue b/src/components/monitoring/firefighting.vue
index 9cc1f8b..31f12d0 100644
--- a/src/components/monitoring/firefighting.vue
+++ b/src/components/monitoring/firefighting.vue
@@ -154,7 +154,7 @@
         <span id="fire_box">设备列表</span>
       </div>
       <div class="tabBox">
-        <el-table @row-click="tableClick" :data="tableData" style="width: 100%"
+        <el-table @row-click="tableClick" :data="tableData" style="width: 100%" @row-contextmenu="tableContext"
           :class="bimModel == 2 ? 'tataitab' : ''">
           <el-table-column label="设备名称" width="130">
             <template slot-scope="scope">
@@ -919,6 +919,13 @@ export default {
       // console.log(row)
       this.bjClick(row);
     },
+    tableContext(row,column, event){
+        event.preventDefault(); // 阻止默认菜单
+        const routerUrl = this.$router.resolve({ path: '/equipment/index', query: {code: row.code } });
+        window.open(routerUrl.href, "_blank");
+      //  this.dialogVisible = true
+      // console.log(row)
+    },
     chooseFire() {
       if (this.bimModel == 1) {
         if (this.towers != null) {
diff --git a/src/components/monitoring/lift.vue b/src/components/monitoring/lift.vue
index b76cf97..153230a 100644
--- a/src/components/monitoring/lift.vue
+++ b/src/components/monitoring/lift.vue
@@ -92,7 +92,7 @@
 				<span id="lift_box">设备列表</span>
 			</div>
 			<div class="tabBox">
-				<el-table @row-click="tableClick" :data="arr" style="width: 100%;max-height: 220px;"
+				<el-table @row-click="tableClick" :data="arr" style="width: 100%;max-height: 220px;" @row-contextmenu="tableContext"
 					:class="bimModel == 2 ? 'tataitab' : ''">
 					<el-table-column label="设备名称" width="160">
 						<template slot-scope="scope">
@@ -346,6 +346,13 @@ export default {
 		bfHelper.clearComponent();
 	},
 	methods: {
+		tableContext(row,column, event){
+			event.preventDefault(); // 阻止默认菜单
+			const routerUrl = this.$router.resolve({ path: '/equipment/index', query: {code: row.code } });
+			window.open(routerUrl.href, "_blank");
+		//  this.dialogVisible = true
+		// console.log(row)
+		},
 		//确认告警 - 重新查询告警列表
 		doCancelWarn(item) {
 			getCancelWarn(item.id).then((res) => {
diff --git a/src/components/monitoring/light.vue b/src/components/monitoring/light.vue
index 38c89b7..634cc00 100644
--- a/src/components/monitoring/light.vue
+++ b/src/components/monitoring/light.vue
@@ -158,7 +158,7 @@
           <img class="switch_icon" src="../../../public/img/monitoring/switch/all-on.png"
             v-if="tableData.buildStatus == 1" alt="" @click="closeTotal" />
           <img class="switch_icon" src="../../../public/img/monitoring/switch/all-off.png" v-else alt=""
-            @click="openTotal" />
+            @click="openTotal"  />
         </div>
         <div class="right_main">
           <img src="../../../public/img/monitoring/switch/beijing.png" alt="" />
@@ -200,7 +200,7 @@
               </div>
             </div>
             <div class="first_switch">
-              <div class="switch_item" v-for="(item1, index1) in item.lightList" :key="index1">
+              <div class="switch_item" v-for="(item1, index1) in item.lightList" :key="index1" @contextmenu="clickLight(item1,$event)">
                 <div>
                   <img class="switch_icon" src="../../../public/img/monitoring/switch/on_lit.png"
                     v-show="item1.openStatus == 1" alt="" @click="controlFun(item1)" />
@@ -717,6 +717,11 @@ export default {
       this.current = val;
       this.getSblb();
     },
+    clickLight(row,event){
+      event.preventDefault(); // 阻止默认菜单
+			const routerUrl = this.$router.resolve({ path: '/equipment/index', query: {code: row.code } });
+			window.open(routerUrl.href, "_blank");
+    },
     // 单个开关
     controlFun(row) {
       this.chooseId = [];
diff --git a/src/components/monitoring/monitoring.vue b/src/components/monitoring/monitoring.vue
index b97f175..a99d77f 100644
--- a/src/components/monitoring/monitoring.vue
+++ b/src/components/monitoring/monitoring.vue
@@ -115,7 +115,7 @@
           <span id="monit_box">设备列表</span>
         </div>
         <div class="tabBox">
-          <el-table @row-click="tableClick" :data="tableData" style="width: 100%; max-height: 210px"
+          <el-table @row-click="tableClick" :data="tableData" style="width: 100%; max-height: 210px" @row-contextmenu="tableContext"
             :class="bimModel == 2 ? 'tataitab' : ''">
             <el-table-column label="设备名称" min-width="150">
               <template slot-scope="scope">
@@ -581,6 +581,13 @@ export default {
     }
   },
   methods: {
+    tableContext(row,column, event){
+        event.preventDefault(); // 阻止默认菜单
+        const routerUrl = this.$router.resolve({ path: '/equipment/index', query: {code: row.code } });
+        window.open(routerUrl.href, "_blank");
+      //  this.dialogVisible = true
+      // console.log(row)
+    },
     //确认告警 - 重新查询告警列表
     doCancelWarn(item) {
       getCancelWarn(item.id).then((res) => {
diff --git a/src/components/monitoring/wall.vue b/src/components/monitoring/wall.vue
index 4d2b8a7..eb2e141 100644
--- a/src/components/monitoring/wall.vue
+++ b/src/components/monitoring/wall.vue
@@ -180,7 +180,7 @@
       <img src="../../../public/img/monitoring/ktborder.png" class="kt-border kt-border4" />
       <div class="tabBox">
         <el-table :data="tableData.slice((current - 1) * size, current * size)" style="width: 100%"
-          @row-click="tableClick" :class="bimModel == 2 ? 'tataitab' : ''">
+          @row-click="tableClick" :class="bimModel == 2 ? 'tataitab' : ''" @row-contextmenu="tableContext">
           <el-table-column label="设备名称" style="cursor: pointer">
             <template slot-scope="scope">
               <div class="flex-center-center mon_box" style="cursor: pointer; overflow: hidden; white-space: nowrap">
@@ -968,6 +968,13 @@ export default {
     tableClick(row, column, event) {
       this.bjClick(row);
     },
+    tableContext(row,column, event){
+        event.preventDefault(); // 阻止默认菜单
+        const routerUrl = this.$router.resolve({ path: '/equipment/index', query: {code: row.code } });
+        window.open(routerUrl.href, "_blank");
+      //  this.dialogVisible = true
+      // console.log(row)
+    },
     bjClick(row) {
       bfHelper.clearTags();
       if (this.bimModel == 1) {
diff --git a/src/components/monitoring/warm.vue b/src/components/monitoring/warm.vue
index 90985ed..b0f58a5 100644
--- a/src/components/monitoring/warm.vue
+++ b/src/components/monitoring/warm.vue
@@ -272,7 +272,7 @@
         <span id="warm_box">设备列表</span>
       </div>
       <div class="tabBox">
-        <el-table :data="tableData.slice((current - 1) * size, current * size)" style="width: 100%; max-height: 210px"
+        <el-table :data="tableData.slice((current - 1) * size, current * size)" style="width: 100%; max-height: 210px" @row-contextmenu="tableContext"
           @row-click="tableClick">
           <el-table-column label="设备名称" align="left" min-width="120px">
             <template slot-scope="scope">
@@ -736,6 +736,13 @@ export default {
     tableClick(row, column, event) {
       this.bjClick(row);
     },
+    tableContext(row,column, event){
+        event.preventDefault(); // 阻止默认菜单
+        const routerUrl = this.$router.resolve({ path: '/equipment/index', query: {code: row.code } });
+        window.open(routerUrl.href, "_blank");
+      //  this.dialogVisible = true
+      // console.log(row)
+    },
     // 点击报警信息定位到指定设备
     bjClick(item) {
       if (item.modelId == "") {
diff --git a/src/components/monitoring/water.vue b/src/components/monitoring/water.vue
index eed08c9..9f82bc0 100644
--- a/src/components/monitoring/water.vue
+++ b/src/components/monitoring/water.vue
@@ -265,7 +265,7 @@
         <span id="water_box">设备列表</span>
       </div>
       <div class="tabBox">
-        <el-table @row-click="tableClick" :data="tableData" style="width: 100%" height="230px"
+        <el-table @row-click="tableClick" :data="tableData" style="width: 100%" height="230px" @row-contextmenu="tableContext"
           :class="bimModel == 2 ? 'tataitab' : ''">
           <el-table-column label="设备名称" width="130">
             <template slot-scope="scope">
@@ -685,6 +685,13 @@ export default {
     tableClick(row, column, event) {
       this.bjClick(row);
     },
+    tableContext(row,column, event){
+        event.preventDefault(); // 阻止默认菜单
+        const routerUrl = this.$router.resolve({ path: '/equipment/index', query: {code: row.code } });
+        window.open(routerUrl.href, "_blank");
+      //  this.dialogVisible = true
+      // console.log(row)
+    },
     addWaterLabel() {
       //添加水表标签
       setTimeout(() => {