Parcourir la source

电视墙 资源详情 样式

wangzhe il y a 2 ans
Parent
commit
95d5675157
3 fichiers modifiés avec 66 ajouts et 42 suppressions
  1. 1 1
      src/assets/styles/base.scss
  2. 4 7
      src/components/TVWalls.vue
  3. 61 34
      src/views/forest.vue

+ 1 - 1
src/assets/styles/base.scss

@@ -89,7 +89,7 @@ $date-state3: #d6333b;
 }
 //电视墙视频摄像头预览弹层样式
 .TVWallCustomWidth {
-  width: 1200px !important;
+  width: 1500px !important;
   height: 740px !important;
   .el-descriptions__body{
     background:transparent !important;

+ 4 - 7
src/components/TVWalls.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog :title="title" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth-right"
+    <el-dialog :title="title" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth"
                @close="cancelEventLocationShow()">
 
       <!--<div @click="findCameraByEventCoordinate()">视频联动</div>-->
@@ -25,11 +25,7 @@
       <div style="display: flex;" >
         <!-- 新增落点详情侧边栏 -->
         <el-descriptions v-if="resourceDataShow" class="margin-top" title="" :column="1" :size="size" direction="horizontal" style="width: 20%;margin-right: 0;position: absolute;right:18px; height:648px; overflow-y: scroll;" border >
-          <el-descriptions-item label-class-name="detailLabel"
-                                content-class-name="detailLabel"
-                                labelStyle="background-color: #0d3164"
-                                contentStyle="background-color: #0d3164"
-                                v-for="resource in resourceData">
+          <el-descriptions-item v-for="resource in resourceData">
             <template slot="label">
               {{resource.key}}
             </template>
@@ -68,7 +64,8 @@ export default {
   components: {},
   data() {
     return {
-      title:['365','369','371','373','372','370'].includes(Cookies.get("deptId"))?"电视墙":"电视墙\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000您的所有操作痕迹已被后台记录,请谨慎操作。部分摄像头处于敏感区域,已屏蔽操控权限,无法操控。",
+      // title:['365','369','371','373','372','370'].includes(Cookies.get("deptId"))?"电视墙":"电视墙\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000您的所有操作痕迹已被后台记录,请谨慎操作。部分摄像头处于敏感区域,已屏蔽操控权限,无法操控。",
+      title: "电视墙\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000您的所有操作痕迹已被后台记录,请谨慎操作。部分摄像头处于敏感区域,已屏蔽操控权限,无法操控。",
       tvListJson: [],
       TVWallVisible: false,
       activeName: 'tv',

+ 61 - 34
src/views/forest.vue

@@ -485,6 +485,7 @@
   import chart from "./from/dvCapsuleChart.vue";
   import {
     getResource,
+    getResourceDetail,
     fireControlViewList,
     fireControlViewPoint,
     getResourcePoint
@@ -1387,42 +1388,68 @@
           },
         ];
         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: [
+        const id = data.id;
+        const type = data.indexName;
+        // alert(type+"="+id)
+        // alert(data.indexName)
+        // getResourceDetail("centerdata_t_resources_illegal_construction", id).then(res => {
+        getResourceDetail(type, id).then(res => {
+          console.log("getResourceDetail=", res)
+          // for (let i in data.cameraList) {
+          data.cameraList = res.data.cameras;
+          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: [
+                {
+                  channelCode: data.cameraList[i].cameraCode,
+                  channelName: data.cameraList[i].cameraName,
+                  channelSn: null,
+                  cameraType: data.cameraList[i].cameraType,
+                  online: "1",
+                  cameraCode: "1",
+                },
+              ],
+            });
+          }
+          const dianshiqiang = [
+            {
+              switchTab: "2",
+              treeLabels: treeLabels,
+              labelChannels: labelChannels,
+            },
+          ];
+          if (data.cameraList.length > 0) {
+            //   this.$refs.TVWall.showTVWall1(
+            //     data.longitude,
+            //     data.latitude,
+            //     dianshiqiang
+            //   );
+            // }
+            this.$refs.TVWalls.showTVWall(
+              dianshiqiang,
               {
-                channelCode: data.cameraList[i].cameraCode,
-                channelName: data.cameraList[i].cameraName,
-                channelSn: null,
-                cameraType:data.cameraList[i].cameraType,
-                online: "1",
-                cameraCode: "1",
+                longitude: data.longitude,
+                latitude: data.latitude,
               },
-            ],
-          });
-        }
-        const dianshiqiang = [
-          {
-            switchTab: "2",
-            treeLabels: treeLabels,
-            labelChannels: labelChannels,
-          },
-        ];
-        if (data.cameraList.length > 0) {
-          this.$refs.TVWall.showTVWall1(
-            data.longitude,
-            data.latitude,
-            dianshiqiang
-          );
-        }
+              {
+                "修改人": "MC",
+                "修改人": "MC",
+                "修改人": "MC",
+                "修改人": "MC",
+                "修改人": "MC"
+              },
+              res.data.detail // item
+            );
+          }
+        });
       },
 
       getBaseInfo() {