浏览代码

电视墙

王通 1 年之前
父节点
当前提交
b6c76d0bba
共有 3 个文件被更改,包括 63 次插入49 次删除
  1. 7 0
      src/api/datacenter.js
  2. 54 47
      src/views/datacenter.vue
  3. 2 2
      vue.config.js

+ 7 - 0
src/api/datacenter.js

@@ -14,3 +14,10 @@ export function fireControlViewPoint(type, name,deptId) {
     method: 'get'
   })
 }
+//点击左侧菜单列表查询落点+按部门分组 NEW
+export function getResourceDetail(type, id) {
+  return request({
+    url: '/sooka-middleware/visual/getResourceDetail?type='+type+'&id='+id,
+    method: 'get'
+  })
+}

+ 54 - 47
src/views/datacenter.vue

@@ -105,8 +105,8 @@
 <script>
 import {
   fireControlViewList,
-  fireControlViewPoint,
-} from "@/api/datacenter";
+  fireControlViewPoint, getResourceDetail
+} from '@/api/datacenter'
 
 import supermap from "@/components/supermap-2.5d"; //超图
 import vheader from "@/components/v-header.vue"; //一体化共用头部
@@ -115,6 +115,7 @@ import eventLocation from "@/components/eventLocation.vue"; //事件定位弹窗
 import TVWall from "@/components/TVWall.vue"; //电视墙弹窗
 import { getIconBg } from "@/api/components/sookaMapIcon";
 import {getUserProfile} from "@/api/system/user";
+
 import { Button } from '@/dahua/TVWalllib/iview' //资源底色控制文件
 
 // import echarts from 'echarts'
@@ -490,57 +491,63 @@ export default {
       return markersMap;
     },
     sewageOutletClick(data) {
-      console.log(data);
       const params = Object.assign({});
       params.longitude = data.longitude;
       params.latitude = data.latitude;
-
-      const treeLabels = [
+      let data1=null
+      getResourceDetail(data.indexName,data.id).then(res=>{
+        data1=res.data
+        const treeLabels = [
+          {
+            id: null,
+            labelCode: "999",
+            labelName: "电视墙",
+            cameraType: null,
+            parentLabelCode: "",
+          },
+        ];
+        const labelChannels = [];
+        if(0<data1.cameras.length)
         {
-          id: null,
-          labelCode: "999",
-          labelName: "电视墙",
-          cameraType: null,
-          parentLabelCode: "",
-        },
-      ];
-      const labelChannels = [];
-      for (let i in data.cameraList) {
-        treeLabels.push({
-          id: null,
-          labelCode: data.cameraList[i].cameraCode,
-          labelName: data.cameraList[i].cameraName,
-          cameraType: data.cameraList[i].cameraType,
-          parentLabelCode: "999",
-        });
-        labelChannels.push({
-          labelCode: data.cameraList[i].cameraCode,
-          channelDates: [
+          for (let i in data1.cameras) {
+            treeLabels.push({
+              id: null,
+              labelCode: data1.cameras[i].cameraCode,
+              labelName: data1.cameras[i].cameraName,
+              cameraType: data1.cameras[i].cameraType,
+              parentLabelCode: "999",
+            });
+            labelChannels.push({
+              labelCode: data1.cameras[i].cameraCode,
+              channelDates: [
+                {
+                  channelCode: data1.cameras[i].cameraCode,
+                  channelName: data1.cameras[i].cameraName,
+                  channelSn: null,
+                  cameraType: data1.cameras[i].cameraType,
+                  online: "1",
+                  cameraCode: "1",
+                },
+              ],
+            });
+          }
+          const dianshiqiang = [
             {
-              channelCode: data.cameraList[i].cameraCode,
-              channelName: data.cameraList[i].cameraName,
-              channelSn: null,
-              cameraType: data.cameraList[i].cameraType,
-              online: "1",
-              cameraCode: "1",
+              switchTab: "2",
+              treeLabels: treeLabels,
+              labelChannels: labelChannels,
             },
-          ],
-        });
-      }
-      const dianshiqiang = [
-        {
-          switchTab: "2",
-          treeLabels: treeLabels,
-          labelChannels: labelChannels,
-        },
-      ];
-      if (data.cameraList.length > 0) {
-        this.$refs.TVWall.showTVWall1(
-          data.longitude,
-          data.latitude,
-          dianshiqiang
-        );
-      }
+          ]
+console.log(dianshiqiang)
+console.log(data1.detail.longitude,data1.detail.latitude)
+            this.$refs.TVWall.showTVWall1(
+              params.longitude,
+              params.latitude,
+              dianshiqiang
+            );
+
+        }
+      })
     },
     indentleftByDeptIdSetMarkers(deptId) {
       this.listCurrentIndex = deptId;

+ 2 - 2
vue.config.js

@@ -52,9 +52,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        //target: `http://127.0.0.1:3031`,
+        target: `http://121.36.228.66:3031`,
         // target: `http://192.168.2.118:3031`,
-          target: `http://192.168.31.235:3031`,
+          //target: `http://192.168.31.235:3031`,
         //  target: `https://29613561xe.eicp.vip`,
         changeOrigin: true,
         pathRewrite: {